X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_stroke.cpp;h=0fb53baa239b59d9e73a63412d99169acabb7fef;hb=c3ad95144d148602f672e95ddda1f18fc35502f8;hp=75b1b4d43f445b53b3d395299ecb6cb062f62990;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp index 75b1b4d..0fb53ba 100644 --- a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp @@ -2,7 +2,7 @@ /*! \file state_stroke.cpp ** \brief Template File ** -** $Id: state_stroke.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley @@ -68,9 +68,9 @@ class studio::StateStroke_Context : public sigc::trackable { etl::handle canvas_view_; CanvasView::IsWorking is_working; - + Duckmatic::Push duckmatic_push; - + etl::smart_ptr > stroke_data; etl::smart_ptr > width_data; @@ -96,7 +96,7 @@ public: etl::handle get_canvas_interface()const{return canvas_view_->canvas_interface();} synfig::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();} WorkArea * get_work_area()const{return canvas_view_->get_work_area();} - + }; // END of class StateStroke_Context @@ -111,7 +111,7 @@ StateStroke::StateStroke(): insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_UP,&StateStroke_Context::event_mouse_up_handler)); insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,&StateStroke_Context::event_mouse_draw_handler)); insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateStroke_Context::event_refresh_tool_options)); -} +} StateStroke::~StateStroke() { @@ -128,15 +128,15 @@ StateStroke_Context::StateStroke_Context(CanvasView* canvas_view): get_work_area()->add_stroke(stroke_data, synfigapp::Main::get_foreground_color()); - synfig::info("Now Scribbling..."); + synfig::info("Now Scribbling..."); } StateStroke_Context::~StateStroke_Context() { duckmatic_push.restore(); - + App::toolbox->refresh(); - synfig::info("No longer scribbling"); + synfig::info("No longer scribbling"); // Send the stroke data to whatever previously called this state. if(stroke_data->size()>=2) @@ -144,19 +144,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; } @@ -172,11 +172,11 @@ StateStroke_Context::event_mouse_up_handler(const Smach::event& x) modifier=event.modifier; throw Smach::pop_exception(); } - + case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu return Smach::RESULT_ACCEPT; - - default: + + default: return Smach::RESULT_OK; } } @@ -191,14 +191,14 @@ StateStroke_Context::event_mouse_draw_handler(const Smach::event& x) { stroke_data->push_back(event.pos); width_data->push_back(event.pressure); - get_work_area()->queue_draw(); + get_work_area()->queue_draw(); return Smach::RESULT_ACCEPT; } - + case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu return Smach::RESULT_ACCEPT; - - default: + + default: return Smach::RESULT_OK; } }