X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_canvaschooser.cpp;h=1d94418003ad9c0ad676737e5d4e7b60a13ea36c;hb=98d969002568a8c55ab35136d236ad98d154ad62;hp=85bb392220ac380de73d7f0330e72f3840200de3;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp index 85bb392..1d94418 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file widget_canvaschooser.cpp ** \brief Template File ** ** $Id: widget_canvaschooser.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 */ /* ========================================================================= */ @@ -38,7 +39,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -58,29 +59,29 @@ Widget_CanvasChooser::~Widget_CanvasChooser() } void -Widget_CanvasChooser::set_parent_canvas(etl::handle x) +Widget_CanvasChooser::set_parent_canvas(etl::handle x) { assert(x); parent_canvas=x; } void -Widget_CanvasChooser::set_value_(etl::handle data) +Widget_CanvasChooser::set_value_(etl::handle data) { set_value(data); activate(); } void -Widget_CanvasChooser::set_value(etl::handle data) +Widget_CanvasChooser::set_value(etl::handle data) { assert(parent_canvas); canvas=data; canvas_menu=manage(new class Gtk::Menu()); - sinfg::Canvas::Children::iterator iter; - sinfg::Canvas::Children &children(parent_canvas->children()); + synfig::Canvas::Children::iterator iter; + synfig::Canvas::Children &children(parent_canvas->children()); String label; if(canvas) @@ -118,7 +119,7 @@ Widget_CanvasChooser::set_value(etl::handle data) set_history(0); } -const etl::handle & +const etl::handle & Widget_CanvasChooser::get_value() { return canvas;