Cleanup dead code

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

diff --git a/synfig-studio/src/gtkmm/iconcontroller.cpp b/synfig-studio/src/gtkmm/iconcontroller.cpp
index 8898a7f..de86bbb 100644 (file)
--- a/synfig-studio/src/gtkmm/iconcontroller.cpp
+++ b/synfig-studio/src/gtkmm/iconcontroller.cpp
@@ -10,6 +10,7 @@
 **  Copyright (c) 2008 Paul Wise
 **  Copyright (c) 2009 Gerco Ballintijn
 **     Copyright (c) 2009 Carlos López
+**     Copyright (c) 2009 Nikita Kitaev
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -110,14 +111,6 @@ IconController::IconController(const synfig::String& /*basepath*/)
                synfig::warning("Unable to open "+path_to_icons+"synfig_icon."+IMAGE_EXT);
        }
 
-/*
-#define INIT_STOCK_ICON(name,iconfile,desc)                                                    \
-       stock_##name=Gtk::StockItem(Gtk::StockID("synfig-" #name),desc);                        \
-       Gtk::Stock::add(stock_##name);                                                          \
-       icon_source.set_filename(path_to_icons+iconfile);                                                       \
-       icon_##name.add_source(icon_source);                                            \
-       icon_factory->add(stock_##name.get_stock_id(),icon_##name)
-*/
 #define INIT_STOCK_ICON(name,iconfile,desc){                                                   \
        Gtk::StockItem stockitem(Gtk::StockID("synfig-" #name),desc); \
        Gtk::Stock::add(stockitem);                                                             \
@@ -210,6 +203,9 @@ IconController::IconController(const synfig::String& /*basepath*/)
        INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon."IMAGE_EXT,_("Increase resolution"));
        INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon."IMAGE_EXT,_("Decrease resolution"));
 
+       INIT_STOCK_ICON(preview_options,"preview_options_icon."IMAGE_EXT,_("Preview Options Dialog"));
+       INIT_STOCK_ICON(render_options,"render_options_icon."IMAGE_EXT,_("Render Options Dialog"));
+
        INIT_STOCK_ICON_CLONE(cvs_add,"gtk-add",_("CVS Add"));
        INIT_STOCK_ICON_CLONE(cvs_update,"gtk-open",_("CVS Update"));
        INIT_STOCK_ICON_CLONE(cvs_commit,"gtk-save",_("CVS Commit"));
@@ -217,6 +213,7 @@ IconController::IconController(const synfig::String& /*basepath*/)
 
        // Tools
        INIT_STOCK_ICON(normal,"normal_icon."IMAGE_EXT,_("Normal Tool"));
+       INIT_STOCK_ICON(transform,"transform_icon."IMAGE_EXT,_("Transform Tool"));
        INIT_STOCK_ICON(polygon,"polyline_icon."IMAGE_EXT,_("Polygon Tool"));
        INIT_STOCK_ICON(bline,"bline_icon."IMAGE_EXT,_("BLine Tool"));
        INIT_STOCK_ICON(eyedrop,"eyedrop_icon."IMAGE_EXT,_("Eyedrop Tool"));
@@ -226,9 +223,9 @@ IconController::IconController(const synfig::String& /*basepath*/)
        INIT_STOCK_ICON(circle,"circle_icon."IMAGE_EXT,_("Circle Tool"));
        INIT_STOCK_ICON(rectangle,"rectangle_icon."IMAGE_EXT,_("Rectangle Tool"));
        INIT_STOCK_ICON(smooth_move,"smooth_move_icon."IMAGE_EXT,_("SmoothMove Tool"));
-       INIT_STOCK_ICON(scale,"scale_icon."IMAGE_EXT,_("Scale Tool"));
+       INIT_STOCK_ICON(rotate,"rotate_icon."IMAGE_EXT,"Rotate Tool");
        INIT_STOCK_ICON(width,"width_icon."IMAGE_EXT,_("Width Tool"));
-       INIT_STOCK_ICON(rotate,"rotate_icon."IMAGE_EXT,_("Rotate Tool"));
+       INIT_STOCK_ICON(scale,"scale_icon."IMAGE_EXT,"Scale Tool");
        INIT_STOCK_ICON(zoom,"zoom_icon."IMAGE_EXT,_("Zoom Tool"));
        INIT_STOCK_ICON(info,"info_icon."IMAGE_EXT,_("Info Tool"));
        INIT_STOCK_ICON(mirror,"mirror_icon."IMAGE_EXT,_("Mirror Tool"));
@@ -236,6 +233,9 @@ IconController::IconController(const synfig::String& /*basepath*/)
        INIT_STOCK_ICON(gradient,"gradient_icon."IMAGE_EXT,_("Gradient Tool"));
        INIT_STOCK_ICON(star,"star_icon."IMAGE_EXT,_("Star Tool"));
 
+#undef INIT_STOCK_ICON
+#undef INIT_STOCK_ICON
+
        icon_factory->add_default();
 
        Gtk::IconSize::register_new("synfig-small_icon",12,12);
@@ -263,6 +263,11 @@ IconController::get_normal_cursor()
 Gdk::Cursor
 IconController::get_tool_cursor(const Glib::ustring& name,const Glib::RefPtr<Gdk::Window>& window)
 {
+       //this function is never called
+       //it is commented out in WorkArea::refresh_cursor()
+       assert(0);
+       // \todo Do we still need it?
+
        Glib::RefPtr<Gdk::Pixmap> pixmap;
        pixmap=Gdk::Pixmap::create(window, 64, 64, 8);
        pixmap->set_colormap(window->get_colormap());