Prevent compiler warnings about unused parameters.

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

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index f638b01..740efd4 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -262,7 +262,7 @@ public:
        }
 
 
-       virtual bool start_frame(synfig::ProgressCallback *cb)
+       virtual bool start_frame(synfig::ProgressCallback */*cb*/)
        {
                synfig::Mutex::Lock lock(mutex);
 
@@ -506,7 +506,7 @@ public:
        }
 
 
-       virtual bool start_frame(synfig::ProgressCallback *cb)
+       virtual bool start_frame(synfig::ProgressCallback */*cb*/)
        {
                return true;
        }
@@ -1288,26 +1288,16 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 
                                if(duck)
                                {
-                                       clicked_duck=0;
+                                       // make a note of whether the duck we click on was selected or not
                                        if(duck_is_selected(duck))
-                                       {
                                                clicked_duck=duck;
-                                       }
                                        else
                                        {
-                                               if(modifier&GDK_SHIFT_MASK)
-                                               {
-                                                       select_duck(duck);
-                                               }
-                                               else if(modifier&GDK_CONTROL_MASK)
-                                               {
-                                                       select_duck(duck);
-                                               }
-                                               else
-                                               {
+                                               clicked_duck=0;
+                                               // if CTRL isn't pressed, clicking an unselected duck will unselect all other ducks
+                                               if(!(modifier&GDK_CONTROL_MASK))
                                                        clear_selected_ducks();
-                                                       select_duck(duck);
-                                               }
+                                               select_duck(duck);
                                        }
                                }
                        }
@@ -1597,37 +1587,20 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
                        get_canvas_view()->duck_refresh_flag=true;
                        if(!drag_did_anything)
                        {
-                               //etl::handle<Duck> duck=find_duck(mouse_pos,radius);
-
-                               if(modifier&GDK_SHIFT_MASK)
+                               // if we originally clicked on a selected duck ...
+                               if(clicked_duck)
                                {
-                                       //synfig::info("DUCK_DRAG_RELEASE: SHIFT-MASK ON!");
-                                       if(clicked_duck)
-                                       {
-                                               //synfig::info("DUCK_DRAG_RELEASE: CLICKED DUCK!");
+                                       // ... and CTRL is pressed, then just toggle the clicked duck
+                                       //     otherwise make the clicked duck the only selected duck
+                                       if(modifier&GDK_CONTROL_MASK)
                                                unselect_duck(clicked_duck);
-                                       }
-                               }
-                               else if(modifier&GDK_CONTROL_MASK)
-                               {
-                                       //synfig::info("DUCK_DRAG_RELEASE: CONTROL-MASK ON!");
-                                       if(clicked_duck)
-                                       {
-                                               //synfig::info("DUCK_DRAG_RELEASE: CLICKED DUCK!");
-                                               unselect_duck(clicked_duck);
-                                       }
-                               }
-                               else
-                               {
-                                       //synfig::info("DUCK_DRAG_RELEASE: NO MASK!");
-                                       if(clicked_duck)
+                                       else
                                        {
-                                               //synfig::info("DUCK_DRAG_RELEASE: CLICKED DUCK!");
                                                clear_selected_ducks();
                                                select_duck(clicked_duck);
                                        }
+                                       clicked_duck->signal_user_click(0)();
                                }
-                               if(clicked_duck)clicked_duck->signal_user_click(0)();
                        }
                        else
                        {
@@ -1655,9 +1628,18 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
                                if(canvas_view->get_smach().process_event(EventBox(drag_point,mouse_pos,MouseButton(event->button.button),modifier))==Smach::RESULT_ACCEPT)
                                        return true;
 
-                               if(!(modifier&GDK_CONTROL_MASK) && !(modifier&GDK_SHIFT_MASK))
+                               // when dragging a box around some ducks:
+                               // SHIFT selects; CTRL toggles; SHIFT+CTRL unselects; <none> clears all then selects
+                               if(modifier&GDK_SHIFT_MASK)
+                                       select_ducks_in_box(drag_point,mouse_pos);
+
+                               if(modifier&GDK_CONTROL_MASK)
+                                       toggle_select_ducks_in_box(drag_point,mouse_pos);
+                               else if(!(modifier&GDK_SHIFT_MASK))
+                               {
                                        clear_selected_ducks();
-                               select_ducks_in_box(drag_point,mouse_pos);
+                                       select_ducks_in_box(drag_point,mouse_pos);
+                               }
                                ret=true;
                        }
                        else
@@ -1799,7 +1781,7 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 }
 
 bool
-WorkArea::on_hruler_event(GdkEvent *event)
+WorkArea::on_hruler_event(GdkEvent */*event*/)
 {
 /*
        switch(event->type)
@@ -1856,7 +1838,7 @@ WorkArea::on_hruler_event(GdkEvent *event)
 }
 
 bool
-WorkArea::on_vruler_event(GdkEvent *event)
+WorkArea::on_vruler_event(GdkEvent */*event*/)
 {
 /*
        switch(event->type)
@@ -1950,7 +1932,7 @@ WorkArea::screen_to_comp_coords(synfig::Point pos)const
 }
 
 synfig::Point
-WorkArea::comp_to_screen_coords(synfig::Point pos)const
+WorkArea::comp_to_screen_coords(synfig::Point /*pos*/)const
 {
        synfig::warning("WorkArea::comp_to_screen_coords: Not yet implemented");
        return synfig::Point();