X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_stroke.cpp;h=a0f7eca3e81c4f42d8e60ed99d9ee386a37fc7d4;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=0fb53baa239b59d9e73a63412d99169acabb7fef;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp index 0fb53ba..a0f7eca 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 +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -126,9 +129,7 @@ StateStroke_Context::StateStroke_Context(CanvasView* canvas_view): width_data.spawn(); stroke_data.spawn(); - get_work_area()->add_stroke(stroke_data, synfigapp::Main::get_foreground_color()); - - synfig::info("Now Scribbling..."); + get_work_area()->add_stroke(stroke_data, synfigapp::Main::get_outline_color()); } StateStroke_Context::~StateStroke_Context() @@ -136,7 +137,6 @@ StateStroke_Context::~StateStroke_Context() 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) @@ -173,9 +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-circut the pop-up menu - return Smach::RESULT_ACCEPT; - default: return Smach::RESULT_OK; } @@ -195,9 +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-circut the pop-up menu - return Smach::RESULT_ACCEPT; - default: return Smach::RESULT_OK; }