X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvastreestore.cpp;h=86d42774a64fae45652bc9723eb957c443835ac0;hb=f7c2dc75685bf7dfce2b8152656938f66d6df11e;hp=a9092be1c27bc894ba3728e145535c6cd20f8f5e;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp index a9092be..86d4277 100644 --- a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp @@ -2,7 +2,7 @@ /*! \file canvastreestore.cpp ** \brief Template File ** -** $Id: canvastreestore.cpp,v 1.1.1.1 2005/01/07 03:34:35 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley @@ -31,7 +31,7 @@ #include "canvastreestore.h" #include -#include "iconcontroler.h" +#include "iconcontroller.h" #include #include #include @@ -40,6 +40,8 @@ #include "cellrenderer_timetrack.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -75,7 +77,7 @@ CanvasTreeStore::~CanvasTreeStore() } void -CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int column, Glib::ValueBase& value)const +CanvasTreeStore::get_value_vfunc(const Gtk::TreeModel::iterator& iter, int column, Glib::ValueBase& value)const { if(column==model.value.index()) { @@ -326,13 +328,8 @@ CanvasTreeStore::find_next_value_desc(const synfigapp::ValueDesc& value_desc, Gt return (bool)iter && value_desc==(*iter)[model.value_desc]; } - - - - - bool -CanvasTreeStore::find_first_value_node(const ValueNode::Handle& value_node, Gtk::TreeIter& iter) +CanvasTreeStore::find_first_value_node(const synfig::ValueNode::Handle& value_node, Gtk::TreeIter& iter) { iter=children().begin(); while(iter && value_node!=(ValueNode::Handle)(*iter)[model.value_node]) @@ -356,7 +353,7 @@ CanvasTreeStore::find_first_value_node(const ValueNode::Handle& value_node, Gtk: } bool -CanvasTreeStore::find_next_value_node(const ValueNode::Handle& value_node, Gtk::TreeIter& iter) +CanvasTreeStore::find_next_value_node(const synfig::ValueNode::Handle& value_node, Gtk::TreeIter& iter) { if(!iter) return find_first_value_node(value_node,iter);