Fix 1829182: "Right click context menu not always appears".

git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2224 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
index b9de1fe..6cf1e54 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
@@ -983,10 +983,6 @@ StateBLine_Context::event_mouse_click_handler(const Smach::event& x)
                        return Smach::RESULT_ACCEPT;
                }
 
-       case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
-               if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
-                       return Smach::RESULT_ACCEPT;
-
        default:
                return Smach::RESULT_OK;
        }

diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
index 1d5666c..10f050e 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
@@ -589,10 +589,6 @@ StateDraw_Context::event_mouse_down_handler(const Smach::event& x)
                        return Smach::RESULT_ACCEPT;
                }
 
-       case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
-               if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
-                       return Smach::RESULT_ACCEPT;
-
        default:
                return Smach::RESULT_OK;
        }

diff --git a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
index 259089f..52b8b12 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
@@ -899,10 +899,6 @@ StatePolygon_Context::event_mouse_click_handler(const Smach::event& x)
                refresh_ducks();
                return Smach::RESULT_ACCEPT;
 
-       case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
-               if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
-                       return Smach::RESULT_ACCEPT;
-
        default:
                return Smach::RESULT_OK;
        }

diff --git a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
index 8722b60..308e3fe 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
@@ -487,10 +487,6 @@ StateSketch_Context::event_mouse_down_handler(const Smach::event& x)
                        return Smach::RESULT_ACCEPT;
                }
 
-       case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
-               if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
-                       return Smach::RESULT_ACCEPT;
-
        default:
                return Smach::RESULT_OK;
        }

diff --git a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
index fc16a32..158881d 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
@@ -173,11 +173,6 @@ StateStroke_Context::event_mouse_up_handler(const Smach::event& x)
                        throw Smach::pop_exception();
                }
 
-       case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
-               printf("%s:%d BUTTON_RIGHT\n", __FILE__, __LINE__);
-               if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
-                       return Smach::RESULT_ACCEPT;
-
        default:
                return Smach::RESULT_OK;
        }
@@ -197,11 +192,6 @@ StateStroke_Context::event_mouse_draw_handler(const Smach::event& x)
                        return Smach::RESULT_ACCEPT;
                }
 
-       case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
-               printf("%s:%d BUTTON_RIGHT\n", __FILE__, __LINE__);
-               if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
-                       return Smach::RESULT_ACCEPT;
-
        default:
                return Smach::RESULT_OK;
        }