Add new icon for the reset colors button and change the code to use it. Icon by genete.

[synfig.git] / synfig-studio / trunk / src / gtkmm / iconcontroller.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
index 200c6ff..8521c5a 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
+++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
@@ -147,6 +147,7 @@ IconController::IconController(const synfig::String& /*basepath*/)
        INIT_STOCK_ICON(string,"string_icon."IMAGE_EXT,_("Rename"));
        INIT_STOCK_ICON(gradient,"gradient_icon."IMAGE_EXT,_("Gradient"));
 
+       INIT_STOCK_ICON(reset_colors,"reset_colors_icon."IMAGE_EXT,_("Reset Colors"));
        INIT_STOCK_ICON(swap_colors,"swap_colors_icon."IMAGE_EXT,_("Swap Colors"));
        INIT_STOCK_ICON(value_node,"valuenode_icon."IMAGE_EXT,_("ValueNode"));
        INIT_STOCK_ICON(about,"about_icon."IMAGE_EXT,_("About"));
@@ -333,8 +334,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 +359,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)