projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SVN r1777 causes get_tooltips_object() to return a NULL pointer for the meta panel...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_stroke.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
index
baf7ebd
..
fc16a32
100644
(file)
--- 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
**
** \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
**
** 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 "toolbox.h"
#include <synfigapp/main.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-127,8
+130,6
@@
StateStroke_Context::StateStroke_Context(CanvasView* canvas_view):
stroke_data.spawn();
get_work_area()->add_stroke(stroke_data, synfigapp::Main::get_foreground_color());
stroke_data.spawn();
get_work_area()->add_stroke(stroke_data, synfigapp::Main::get_foreground_color());
-
- synfig::info("Now Scribbling...");
}
StateStroke_Context::~StateStroke_Context()
}
StateStroke_Context::~StateStroke_Context()
@@
-136,7
+137,6
@@
StateStroke_Context::~StateStroke_Context()
duckmatic_push.restore();
App::toolbox->refresh();
duckmatic_push.restore();
App::toolbox->refresh();
- synfig::info("No longer scribbling");
// Send the stroke data to whatever previously called this state.
if(stroke_data->size()>=2)
// Send the stroke data to whatever previously called this state.
if(stroke_data->size()>=2)
@@
-174,7
+174,9
@@
StateStroke_Context::event_mouse_up_handler(const Smach::event& x)
}
case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
}
case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
- return Smach::RESULT_ACCEPT;
+ 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;
default:
return Smach::RESULT_OK;
@@
-196,7
+198,9
@@
StateStroke_Context::event_mouse_draw_handler(const Smach::event& x)
}
case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
}
case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
- return Smach::RESULT_ACCEPT;
+ 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;
default:
return Smach::RESULT_OK;