Cleanup dead code

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

diff --git a/synfig-studio/src/gtkmm/app.cpp b/synfig-studio/src/gtkmm/app.cpp
index 232a323..01a4f8f 100644 (file)
--- a/synfig-studio/src/gtkmm/app.cpp
+++ b/synfig-studio/src/gtkmm/app.cpp
@@ -74,7 +74,6 @@
 #include "dialog_gradient.h"
 #include "dialog_color.h"
 #include "toolbox.h"
-#include "compview.h"
 #include "onemoment.h"
 
 #include "dockmanager.h"
@@ -756,9 +755,9 @@ init_ui_manager()
                ));
        }
 
-#define DEFINE_ACTION(x,stock) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); /*action->set_sensitive(false);*/ actions_action_group->add(action); }
-#define DEFINE_ACTION2(x,stock,label) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock,label,label) ); /*action->set_sensitive(false);*/ actions_action_group->add(action); }
-#define DEFINE_ACTION_SIG(group,x,stock,sig) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); /*action->set_sensitive(false);*/ group->add(action,sig); }
+#define DEFINE_ACTION(x,stock) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); actions_action_group->add(action); }
+#define DEFINE_ACTION2(x,stock,label) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock,label,label) ); actions_action_group->add(action); }
+#define DEFINE_ACTION_SIG(group,x,stock,sig) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); group->add(action,sig); }
 
        DEFINE_ACTION2("keyframe-properties", Gtk::StockID("gtk-properties"), _("Keyframe Properties"));
        DEFINE_ACTION("about", Gtk::StockID("synfig-about"));
@@ -845,40 +844,8 @@ init_ui_manager()
        DEFINE_ACTION("amount-dec", _("Decrease Amount"));
 
 #undef DEFINE_ACTION
-
-
-// Set up synfigapp actions
-       /*{
-               synfigapp::Action::Book::iterator iter;
-
-               for(iter=synfigapp::Action::book().begin();iter!=synfigapp::Action::book().end();++iter)
-               {
-                       Gtk::StockID stock_id;
-
-                       if(!(iter->second.category&synfigapp::Action::CATEGORY_HIDDEN))
-                       {
-                               //Gtk::Image* image(manage(new Gtk::Image()));
-                               if(iter->second.task=="raise")                  stock_id=Gtk::Stock::GO_UP;
-                               else if(iter->second.task=="lower")             stock_id=Gtk::Stock::GO_DOWN;
-                               else if(iter->second.task=="move_top")  stock_id=Gtk::Stock::GOTO_TOP;
-                               else if(iter->second.task=="move_bottom")       stock_id=Gtk::Stock::GOTO_BOTTOM;
-                               else if(iter->second.task=="remove")    stock_id=Gtk::Stock::DELETE;
-                               else if(iter->second.task=="set_on")    stock_id=Gtk::Stock::YES;
-                               else if(iter->second.task=="set_off")   stock_id=Gtk::Stock::NO;
-                               //else if(iter->second.task=="duplicate")       stock_id=Gtk::Stock::COPY;
-                               else if(iter->second.task=="remove")    stock_id=Gtk::Stock::DELETE;
-                               else                                                                    stock_id=Gtk::StockID("synfig-"+iter->second.task);
-
-                               actions_action_group->add(Gtk::Action::create(
-                                       "action-"+iter->second.name,
-                                       stock_id,
-                                       iter->second.local_name,iter->second.local_name
-                               ));
-                       }
-               }
-       }
-*/
-
+#undef DEFINE_ACTION_2
+#undef DEFINE_ACTION_SIG
 
     Glib::ustring ui_info =
 "<ui>"
@@ -1135,6 +1102,7 @@ init_ui_manager()
        ACCEL("End",                                                                                                            "<Actions>/canvasview/seek-end"                                         );
 
 #undef ACCEL
+#undef ACCEL2
 }
 
 #ifdef _WIN32
@@ -1428,14 +1396,8 @@ App::~App()
 
        toolbox->hide();
 
-//     studio::App::iteration(false);
-
        delete toolbox;
 
-//     studio::App::iteration(false);
-
-//     studio::App::iteration(false);
-
        delete dialog_setup;
 
        delete dialog_gradient;
@@ -1447,8 +1409,6 @@ App::~App()
        delete dock_manager;
 
        instance_list.clear();
-
-//     studio::App::iteration(false);
 }
 
 String
@@ -1956,7 +1916,7 @@ App::dialog_open_file(const std::string &title, std::string &filename, std::stri
        }
        return false;
 
-#else
+#else   // not USE_WIN32_FILE_DIALOGS
        synfig::String prev_path;
 
        if(!_preferences.get_value(preference, prev_path))
@@ -1987,52 +1947,7 @@ App::dialog_open_file(const std::string &title, std::string &filename, std::stri
 
     delete dialog;
     return false;
-
-    /*
-
-       GtkWidget *ok;
-       GtkWidget *cancel;
-       int val=0;
-
-       GtkWidget *fileselection;
-       fileselection = gtk_file_selection_new(title.c_str());
-
-
-       if(basename(filename)==filename)
-       {
-               gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),(prev_path+ETL_DIRECTORY_SEPARATOR).c_str());
-       }
-       else
-               gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),dirname(filename).c_str());
-
-       gtk_file_selection_complete(GTK_FILE_SELECTION(fileselection),basename(filename).c_str());
-
-       ok=GTK_FILE_SELECTION(fileselection)->ok_button;
-       cancel=GTK_FILE_SELECTION(fileselection)->cancel_button;
-
-       gtk_signal_connect(GTK_OBJECT(ok),"clicked",GTK_SIGNAL_FUNC(Signal_Open_Ok),&val);
-       gtk_signal_connect(GTK_OBJECT(cancel),"clicked",GTK_SIGNAL_FUNC(Signal_Open_Cancel),&val);
-
-       gtk_widget_show(fileselection);
-
-       while(!val)
-               iteration();
-
-
-       if(val==1)
-       {
-               filename=gtk_file_selection_get_filename(GTK_FILE_SELECTION(fileselection));
-               _preferences.set_value(preference,dirname(filename));
-       }
-       else
-       {
-               gtk_widget_destroy(fileselection);
-               return false;
-       }
-       gtk_widget_destroy(fileselection);
-       return true;
-    */
-#endif
+#endif   // not USE_WIN32_FILE_DIALOGS
 }
 
 bool