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

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

diff --git a/synfig-studio/tags/stable/src/gtkmm/widget_value.h b/synfig-studio/tags/stable/src/gtkmm/widget_value.h
index fa812b7..99bdf5b 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/widget_value.h
+++ b/synfig-studio/tags/stable/src/gtkmm/widget_value.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
-/*!    \file widget_value.cpp
+/* === S Y N F I G ========================================================= */
+/*!    \file widget_value.h
 **     \brief Template File
 **
-**     $Id: widget_value.h,v 1.1.1.1 2005/01/07 03:34:37 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_VALUE_H
-#define __SINFG_GTKMM_VALUE_H
+#ifndef __SYNFIG_GTKMM_VALUE_H
+#define __SYNFIG_GTKMM_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>
@@ -50,10 +50,10 @@
 //#include <gtkmm/colorselection.h>
 #include <gtkmm/optionmenu.h>
 
-//#include <sinfg/sinfg.h>
-#include <sinfg/paramdesc.h>
-#include <sinfg/value.h>
-#include <sinfg/canvas.h>
+//#include <synfig/synfig.h>
+#include <synfig/paramdesc.h>
+#include <synfig/value.h>
+#include <synfig/canvas.h>
 
 
 /* === M A C R O S ========================================================= */
@@ -72,11 +72,11 @@ class Widget_Filename;
 class Widget_Vector;
 class Widget_Time;
 class Widget_Distance;
-       
+
 class Widget_ValueBase : public Gtk::HBox
 {
        Gtk::Label *label;
-       sinfg::ValueBase value;
+       synfig::ValueBase value;
 
        Widget_Vector *vector_widget;
        Gtk::SpinButton *real_widget;
@@ -95,35 +95,35 @@ class Widget_ValueBase : public Gtk::HBox
        Widget_Time *time_widget;
        Gtk::Entry *string_widget;
        Widget_Distance *distance_widget;
-       
+
 //     std::string hint;
-       
-       sinfg::ParamDesc param_desc;
-       etl::handle<sinfg::Canvas> canvas;
+
+       synfig::ParamDesc param_desc;
+       etl::handle<synfig::Canvas> canvas;
        sigc::signal<void> signal_value_changed_;
        sigc::signal<void> signal_activate_;
 
 public:
        sigc::signal<void> &signal_value_changed() { return signal_value_changed_; }
-       
+
        void activate();
-       
+
        sigc::signal<void>& signal_activate() { return signal_activate_; }
 
-       void set_value(const sinfg::ValueBase &data);
-       const sinfg::ValueBase &get_value();
+       void set_value(const synfig::ValueBase &data);
+       const synfig::ValueBase &get_value();
 
        void on_grab_focus();
-       
-       void set_param_desc(const sinfg::ParamDesc &x) { param_desc=x; }
-       const sinfg::ParamDesc &get_param_desc() { return param_desc; }
+
+       void set_param_desc(const synfig::ParamDesc &x) { param_desc=x; }
+       const synfig::ParamDesc &get_param_desc() { return param_desc; }
 
        void set_sensitive(bool x);
-       
+
        //void set_hint(std::string x) { hint=x; }
 //     std::string get_hint() { return hint; }
 
-       void set_canvas(etl::handle<sinfg::Canvas> x) { canvas=x; assert(canvas); }
+       void set_canvas(etl::handle<synfig::Canvas> x) { canvas=x; assert(canvas); }
        void inside_cellrenderer();
        Widget_ValueBase();
        ~Widget_ValueBase();