Prevent compiler warnings about unused parameters.

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

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 214f73a..c45d4c3 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -352,7 +352,7 @@ public:
        }
 
        virtual bool
-       amount_complete(int current, int total)
+       amount_complete(int /*current*/, int /*total*/)
        {
                while(studio::App::events_pending())studio::App::iteration(false);
                return true;
@@ -458,7 +458,15 @@ int v_key_check(const char* key, U32* serial, U32 appid)
 }
 
 
+#ifdef _WIN32
+# ifdef LICENSE_KEY_REQUIRED
 int check_license(String basedir)
+# else
+int check_license(String /*basedir*/)
+# endif
+#else
+int check_license(String /*basedir*/)
+#endif
 {
 #ifdef LICENSE_KEY_REQUIRED
        String key;
@@ -1239,15 +1247,16 @@ App::App(int *argc, char ***argv):
 
                state_manager->add_state(&state_zoom);
 
-               // Disabled this tool because it should be
-               // considered deprecated. Use the bline tool instead.
-               if(getenv("SYNFIG_ENABLE_POLYGON")) state_manager->add_state(&state_polygon);
+               // Enabled - it's useful to be able to work with polygons without tangent ducks getting in the way.
+               // I know we can switch tangent ducks off, but why not allow this kind of layer as well?
+               if(!getenv("SYNFIG_DISABLE_POLYGON")) state_manager->add_state(&state_polygon);
+
+               // Enabled for now.  Let's see whether they're good enough yet.
+               if(!getenv("SYNFIG_DISABLE_DRAW"   )) state_manager->add_state(&state_draw);
+               if(!getenv("SYNFIG_DISABLE_SKETCH" )) state_manager->add_state(&state_sketch);
 
-               // These tools are disabled by default for now,
-               // because they tend to confuse users.
-               if(getenv("SYNFIG_ENABLE_DRAW"  )) state_manager->add_state(&state_draw);
-               if(getenv("SYNFIG_ENABLE_SKETCH")) state_manager->add_state(&state_sketch);
-               if(getenv("SYNFIG_ENABLE_WIDTH" )) state_manager->add_state(&state_width);
+               // Disabled by default - it doesn't work properly?
+               if(getenv("SYNFIG_ENABLE_WIDTH"    )) state_manager->add_state(&state_width);
 
                studio_init_cb.task("Init ModPalette...");
                module_list_.push_back(new ModPalette()); module_list_.back()->start();
@@ -1627,8 +1636,8 @@ App::show_setup()
        dialog_setup->show();
 }
 
-gint Signal_Open_Ok(GtkWidget *widget, int *val){*val=1;return 0;}
-gint Signal_Open_Cancel(GtkWidget *widget, int *val){*val=2;return 0;}
+gint Signal_Open_Ok(GtkWidget */*widget*/, int *val){*val=1;return 0;}
+gint Signal_Open_Cancel(GtkWidget */*widget*/, int *val){*val=2;return 0;}
 
 //#ifdef WIN32
 //#define USE_WIN32_FILE_DIALOGS 1