Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-studio / tags / stable / src / gtkmm / cellrenderer_value.h

diff --git a/synfig-studio/tags/stable/src/gtkmm/cellrenderer_value.h b/synfig-studio/tags/stable/src/gtkmm/cellrenderer_value.h
index 90bcb79..4aba7b9 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/cellrenderer_value.h
+++ b/synfig-studio/tags/stable/src/gtkmm/cellrenderer_value.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
-/*!    \file cellrenderer_value.cpp
+/* === S Y N F I G ========================================================= */
+/*!    \file cellrenderer_value.h
 **     \brief Template File
 **
-**     $Id: cellrenderer_value.h,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**     $Id$
 **
 **     \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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_GTKMM_CELLRENDERER_VALUE_H
-#define __SINFG_GTKMM_CELLRENDERER_VALUE_H
+#ifndef __SYNFIG_GTKMM_CELLRENDERER_VALUE_H
+#define __SYNFIG_GTKMM_CELLRENDERER_VALUE_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -38,7 +39,6 @@
 #include <gtkmm/statusbar.h>
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>
-#include <atkmm/stateset.h>
 #include <gtkmm/paned.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/treestore.h>
@@ -51,9 +51,9 @@
 #include <gtkmm/colorselection.h>
 #include <gtkmm/optionmenu.h>
 
-//#include <sinfg/sinfg.h>
-#include <sinfg/paramdesc.h>
-#include <sinfg/value.h>
+//#include <synfig/synfig.h>
+#include <synfig/paramdesc.h>
+#include <synfig/value.h>
 
 
 /* === M A C R O S ========================================================= */
@@ -76,32 +76,32 @@ class ValueBase_Entry;
 class CellRenderer_ValueBase : public Gtk::CellRendererText
 {
        sigc::signal<void, const Glib::ustring&> signal_secondary_click_;
-       sigc::signal<void, const Glib::ustring&, sinfg::ValueBase> signal_edited_;
+       sigc::signal<void, const Glib::ustring&, synfig::ValueBase> signal_edited_;
 
-       Glib::Property<sinfg::ValueBase> property_value_;
-       Glib::Property<etl::handle<sinfg::Canvas> > property_canvas_;
-       Glib::Property<sinfg::ParamDesc> property_param_desc_;
+       Glib::Property<synfig::ValueBase> property_value_;
+       Glib::Property<etl::handle<synfig::Canvas> > property_canvas_;
+       Glib::Property<synfig::ParamDesc> property_param_desc_;
 
        void string_edited_(const Glib::ustring&,const Glib::ustring&);
 
-       void gradient_edited(sinfg::Gradient gradient, Glib::ustring path);
-       void color_edited(sinfg::Color color, Glib::ustring path);
-       
+       void gradient_edited(synfig::Gradient gradient, Glib::ustring path);
+       void color_edited(synfig::Color color, Glib::ustring path);
+
 public:
        sigc::signal<void, const Glib::ustring&> &signal_secondary_click()
        {return signal_secondary_click_; }
 
-       sigc::signal<void, const Glib::ustring&, sinfg::ValueBase> &signal_edited()
+       sigc::signal<void, const Glib::ustring&, synfig::ValueBase> &signal_edited()
        {return signal_edited_; }
 
-       Glib::PropertyProxy<sinfg::ValueBase> property_value() { return property_value_.get_proxy();}
-       Glib::PropertyProxy<etl::handle<sinfg::Canvas> > property_canvas() { return property_canvas_.get_proxy();}
-       Glib::PropertyProxy<sinfg::ParamDesc> property_param_desc() { return property_param_desc_.get_proxy(); }
-       Glib::PropertyProxy<bool> property_inconsistant() { return property_foreground_set(); }
+       Glib::PropertyProxy<synfig::ValueBase> property_value() { return property_value_.get_proxy();}
+       Glib::PropertyProxy<etl::handle<synfig::Canvas> > property_canvas() { return property_canvas_.get_proxy();}
+       Glib::PropertyProxy<synfig::ParamDesc> property_param_desc() { return property_param_desc_.get_proxy(); }
+       Glib::PropertyProxy<bool> property_inconsistent() { return property_foreground_set(); }
+
+       etl::handle<synfig::Canvas> get_canvas()const { return property_canvas_; }
+       synfig::ParamDesc get_param_desc()const { return property_param_desc_; }
 
-       etl::handle<sinfg::Canvas> get_canvas()const { return property_canvas_; }
-       sinfg::ParamDesc get_param_desc()const { return property_param_desc_; }
-       
        CellRenderer_ValueBase();
        ~CellRenderer_ValueBase();
 
@@ -117,7 +117,7 @@ public:
                const Gdk::Rectangle& ca,
                const Gdk::Rectangle& expose_area,
                Gtk::CellRendererState flags);
-       
+
        virtual Gtk::CellEditable* start_editing_vfunc(GdkEvent* event,
                                                  Gtk::Widget& widget,
                                                  const Glib::ustring& path,