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 bde450c..95452d3 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"
@@ -845,7 +844,8 @@ init_ui_manager()
        DEFINE_ACTION("amount-dec", _("Decrease Amount"));
 
 #undef DEFINE_ACTION
-
+#undef DEFINE_ACTION_2
+#undef DEFINE_ACTION_SIG
 
 // Set up synfigapp actions
        /*{
@@ -1135,6 +1135,7 @@ init_ui_manager()
        ACCEL("End",                                                                                                            "<Actions>/canvasview/seek-end"                                         );
 
 #undef ACCEL
+#undef ACCEL2
 }
 
 #ifdef _WIN32
@@ -1428,14 +1429,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 +1442,6 @@ App::~App()
        delete dock_manager;
 
        instance_list.clear();
-
-//     studio::App::iteration(false);
 }
 
 String
@@ -1956,7 +1949,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 +1980,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
@@ -2101,7 +2049,8 @@ App::dialog_save_file(const std::string &title, std::string &filename, std::stri
        {
                file_type_enum = manage(new Widget_Enum());
                file_type_enum->set_param_desc(ParamDesc().set_hint("enum")
-                                                                          .add_enum_value(synfig::RELEASE_VERSION_0_61_09, "0.61.09", strprintf("0.61.09 (%s)", _("current")))
+                                                                          .add_enum_value(synfig::RELEASE_VERSION_0_62_00, "0.62.00", strprintf("0.62.00 (%s)", _("current")))
+                                                                          .add_enum_value(synfig::RELEASE_VERSION_0_61_09, "0.61.09", "0.61.09")
                                                                           .add_enum_value(synfig::RELEASE_VERSION_0_61_08, "0.61.08", "0.61.08")
                                                                           .add_enum_value(synfig::RELEASE_VERSION_0_61_07, "0.61.07", "0.61.07")
                                                                           .add_enum_value(synfig::RELEASE_VERSION_0_61_06, "0.61.06", strprintf("0.61.06 %s", _("and older"))));