X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ficoncontroller.cpp;h=d7dcde52e51b78a8911da1b029e734d9415a91bd;hb=125a2cdd9105661fa1e3d0050c6b863b90221b8a;hp=912487ecf1e333926d8be772f6ab8a44a0f26636;hpb=6058f1f8af684257c314a78cc0a24ced57bf3168;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp index 912487e..d7dcde5 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp @@ -334,6 +334,11 @@ studio::get_tree_pixbuf(synfig::ValueBase::Type type) return _tree_pixbuf_table_value_type[int(type)]; } +#ifdef WIN32 +#define TEMPORARY_DELETE_MACRO DELETE +#undef DELETE +#endif + Gtk::StockID studio::get_action_stock_id(const synfigapp::Action::BookEntry& action) { @@ -354,6 +359,11 @@ studio::get_action_stock_id(const synfigapp::Action::BookEntry& action) return stock_id; } +#ifdef WIN32 +#define DELETE TEMPORARY_DELETE_MACRO +#undef TEMPORARY_DELETE_MACRO +#endif + Gtk::StockID studio::layer_icon(const synfig::String &layer) {