X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_stroke.cpp;h=3bf3d1cf05521dd17e0e8e350f242c692d9d9aaf;hb=6204b47351d21c0dcde44b4a877a937dd14eb0dd;hp=479f0ea0b2419f469ceca5b1719efda16f469018;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
index 479f0ea..3bf3d1c 100644
--- a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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
@@ -47,6 +48,8 @@
 #include "toolbox.h"
 #include <synfigapp/main.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -144,19 +147,19 @@ StateStroke_Context::~StateStroke_Context()
 }
 
 Smach::event_result
-StateStroke_Context::event_refresh_tool_options(const Smach::event& x)
+StateStroke_Context::event_refresh_tool_options(const Smach::event& /*x*/)
 {
 	return Smach::RESULT_ACCEPT;
 }
 
 Smach::event_result
-StateStroke_Context::event_stop_handler(const Smach::event& x)
+StateStroke_Context::event_stop_handler(const Smach::event& /*x*/)
 {
 	throw Smach::pop_exception();
 }
 
 Smach::event_result
-StateStroke_Context::event_refresh_handler(const Smach::event& x)
+StateStroke_Context::event_refresh_handler(const Smach::event& /*x*/)
 {
 	return Smach::RESULT_ACCEPT;
 }
@@ -173,8 +176,10 @@ StateStroke_Context::event_mouse_up_handler(const Smach::event& x)
 			throw Smach::pop_exception();
 		}
 
-	case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu
-		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;
@@ -195,8 +200,10 @@ StateStroke_Context::event_mouse_draw_handler(const Smach::event& x)
 			return Smach::RESULT_ACCEPT;
 		}
 
-	case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu
-		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;