X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ficoncontroller.cpp;h=d7dcde52e51b78a8911da1b029e734d9415a91bd;hb=125a2cdd9105661fa1e3d0050c6b863b90221b8a;hp=200c6ff702bae63763112e725d7819083458aefa;hpb=282b5162f219e2114a59a00743180b45c238680f;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp index 200c6ff..d7dcde5 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp @@ -333,8 +333,12 @@ studio::get_tree_pixbuf(synfig::ValueBase::Type type) //return Gtk::Button().render_icon(value_icon(type),Gtk::ICON_SIZE_SMALL_TOOLBAR); 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,8 +358,11 @@ studio::get_action_stock_id(const synfigapp::Action::BookEntry& action) action.task); return stock_id; } + +#ifdef WIN32 #define DELETE TEMPORARY_DELETE_MACRO #undef TEMPORARY_DELETE_MACRO +#endif Gtk::StockID studio::layer_icon(const synfig::String &layer)