From 2388b7e41f28378da005058842c927fe368e2808 Mon Sep 17 00:00:00 2001 From: pabs Date: Sun, 24 Feb 2008 05:51:51 +0000 Subject: [PATCH] Make a Windows specific fix specific to Windows git-svn-id: http://svn.voria.com/code@1811 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/src/gtkmm/iconcontroller.cpp | 7 +++++++ 1 file changed, 7 insertions(+) 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) -- 2.7.4