X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_stroke.cpp;h=75b1b4d43f445b53b3d395299ecb6cb062f62990;hb=d9a892b2c457b58ffad058eba55802265b2967fa;hp=f4e91a9fab3a25a94ced012161bd8d1a35d8c6c8;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp index f4e91a9..75b1b4d 100644 --- a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file state_stroke.cpp ** \brief Template File ** ** $Id: state_stroke.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -31,20 +32,20 @@ #include #include -#include +#include #include "state_stroke.h" #include "canvasview.h" #include "workarea.h" #include "app.h" -#include +#include #include #include #include #include "event_mouse.h" #include "event_layerclick.h" #include "toolbox.h" -#include +#include #endif @@ -52,7 +53,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -70,9 +71,9 @@ class studio::StateStroke_Context : public sigc::trackable Duckmatic::Push duckmatic_push; - etl::smart_ptr > stroke_data; + etl::smart_ptr > stroke_data; - etl::smart_ptr > width_data; + etl::smart_ptr > width_data; Gdk::ModifierType modifier; @@ -92,8 +93,8 @@ public: ~StateStroke_Context(); const etl::handle& get_canvas_view()const{return canvas_view_;} - etl::handle get_canvas_interface()const{return canvas_view_->canvas_interface();} - sinfg::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();} + 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 @@ -125,9 +126,9 @@ StateStroke_Context::StateStroke_Context(CanvasView* canvas_view): width_data.spawn(); stroke_data.spawn(); - get_work_area()->add_stroke(stroke_data, sinfgapp::Main::get_foreground_color()); + get_work_area()->add_stroke(stroke_data, synfigapp::Main::get_foreground_color()); - sinfg::info("Now Scribbling..."); + synfig::info("Now Scribbling..."); } StateStroke_Context::~StateStroke_Context() @@ -135,7 +136,7 @@ StateStroke_Context::~StateStroke_Context() duckmatic_push.restore(); App::toolbox->refresh(); - sinfg::info("No longer scribbling"); + synfig::info("No longer scribbling"); // Send the stroke data to whatever previously called this state. if(stroke_data->size()>=2)