Added copyright lines for files I've edited this year.

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

diff --git a/synfig-studio/trunk/src/gtkmm/state_normal.cpp b/synfig-studio/trunk/src/gtkmm/state_normal.cpp
index e92c568..f428c3f 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_normal.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_normal.cpp
@@ -2,10 +2,11 @@
 /*!    \file state_normal.cpp
 **     \brief Template File
 **
-**     $Id: state_normal.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007, 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -41,6 +42,8 @@
 #include <synfig/valuenode_composite.h>
 #include <synfig/valuenode_const.h>
 #include "canvasview.h"
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -119,12 +122,12 @@ StateNormal::~StateNormal()
 StateNormal_Context::StateNormal_Context(CanvasView *canvas_view):
        canvas_view(canvas_view)
 {
-       synfig::info("Enterted Normal State");
+       // synfig::info("Entered Normal State");
 }
 
 StateNormal_Context::~StateNormal_Context()
 {
-       synfig::info("Left Normal State");
+       // synfig::info("Left Normal State");
 }
 
 void
@@ -135,49 +138,49 @@ StateNormal_Context::refresh_tool_options()
 }
 
 Smach::event_result
-StateNormal_Context::event_refresh_tool_options(const Smach::event& x)
+StateNormal_Context::event_refresh_tool_options(const Smach::event& /*x*/)
 {
        refresh_tool_options();
        return Smach::RESULT_ACCEPT;
 }
 
 Smach::event_result
-StateNormal_Context::event_stop_handler(const Smach::event& x)
+StateNormal_Context::event_stop_handler(const Smach::event& /*x*/)
 {
-       synfig::info("STATE NORMAL: Received Stop Event");
+       // synfig::info("STATE NORMAL: Received Stop Event");
        canvas_view->stop();
        return Smach::RESULT_ACCEPT;
 }
 
 Smach::event_result
-StateNormal_Context::event_refresh_handler(const Smach::event& x)
+StateNormal_Context::event_refresh_handler(const Smach::event& /*x*/)
 {
-       synfig::info("STATE NORMAL: Received Refresh Event");
+       // synfig::info("STATE NORMAL: Received Refresh Event");
        canvas_view->rebuild_tables();
        canvas_view->work_area->queue_render_preview();
        return Smach::RESULT_ACCEPT;
 }
 
 Smach::event_result
-StateNormal_Context::event_refresh_ducks_handler(const Smach::event& x)
+StateNormal_Context::event_refresh_ducks_handler(const Smach::event& /*x*/)
 {
-       synfig::info("STATE NORMAL: Received Refresh Ducks");
+       // synfig::info("STATE NORMAL: Received Refresh Ducks");
        canvas_view->queue_rebuild_ducks();
        return Smach::RESULT_ACCEPT;
 }
 
 Smach::event_result
-StateNormal_Context::event_undo_handler(const Smach::event& x)
+StateNormal_Context::event_undo_handler(const Smach::event& /*x*/)
 {
-       synfig::info("STATE NORMAL: Received Undo Event");
+       // synfig::info("STATE NORMAL: Received Undo Event");
        canvas_view->get_instance()->undo();
        return Smach::RESULT_ACCEPT;
 }
 
 Smach::event_result
-StateNormal_Context::event_redo_handler(const Smach::event& x)
+StateNormal_Context::event_redo_handler(const Smach::event& /*x*/)
 {
-       synfig::info("STATE NORMAL: Received Redo Event");
+       // synfig::info("STATE NORMAL: Received Redo Event");
        canvas_view->get_instance()->redo();
        return Smach::RESULT_ACCEPT;
 }
@@ -185,7 +188,7 @@ StateNormal_Context::event_redo_handler(const Smach::event& x)
 Smach::event_result
 StateNormal_Context::event_mouse_button_down_handler(const Smach::event& x)
 {
-       synfig::info("STATE NORMAL: Received mouse button down Event");
+       // synfig::info("STATE NORMAL: Received mouse button down Event");
 
        const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
 
@@ -206,11 +209,11 @@ StateNormal_Context::event_layer_click(const Smach::event& x)
 
        if(event.layer)
        {
-               synfig::info("STATE NORMAL: Received layer click Event, \"%s\"",event.layer->get_name().c_str());
+               // synfig::info("STATE NORMAL: Received layer click Event, \"%s\"",event.layer->get_name().c_str());
        }
        else
        {
-               synfig::info("STATE NORMAL: Received layer click Event with an empty layer.");
+               // synfig::info("STATE NORMAL: Received layer click Event with an empty layer.");
        }
 
        switch(event.button)
@@ -263,10 +266,8 @@ StateNormal_Context::edit_several_waypoints(std::list<synfigapp::ValueDesc> valu
        dialog.add_button(Gtk::StockID("gtk-cancel"),0);
        dialog.show();
 
-       DEBUGPOINT();
        if(dialog.run()==0)
                return;
-       DEBUGPOINT();
        synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Set Waypoints"));
 
        std::list<synfigapp::ValueDesc>::iterator iter;
@@ -363,9 +364,9 @@ StateNormal_Context::edit_several_waypoints(std::list<synfigapp::ValueDesc> valu
 */
 
 Smach::event_result
-StateNormal_Context::event_multiple_ducks_clicked_handler(const Smach::event& x)
+StateNormal_Context::event_multiple_ducks_clicked_handler(const Smach::event& /*x*/)
 {
-       synfig::info("STATE NORMAL: Received multiple duck click event");
+       // synfig::info("STATE NORMAL: Received multiple duck click event");
 
        //const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
 
@@ -395,6 +396,7 @@ StateNormal_Context::event_multiple_ducks_clicked_handler(const Smach::event& x)
        }
 
        Gtk::Menu *menu=manage(new Gtk::Menu());
+       menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
 
        canvas_view->get_instance()->make_param_menu(menu,canvas_view->get_canvas(),value_desc_list);