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

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

diff --git a/synfig-studio/tags/stable/src/gtkmm/widget_color.h b/synfig-studio/tags/stable/src/gtkmm/widget_color.h
index 14d52ce..5763bc0 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/widget_color.h
+++ b/synfig-studio/tags/stable/src/gtkmm/widget_color.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file widget_color.h
 **     \brief Template Header
 **
-**     $Id: widget_color.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_STUDIO_WIDGET_COLOR_H
-#define __SINFG_STUDIO_WIDGET_COLOR_H
+#ifndef __SYNFIG_STUDIO_WIDGET_COLOR_H
+#define __SYNFIG_STUDIO_WIDGET_COLOR_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -31,7 +32,7 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/drawingarea.h>
-#include <sinfg/color.h>
+#include <synfig/color.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -42,14 +43,14 @@
 namespace studio {
 
 
-Gdk::Color colorconv_sinfg2gdk(const sinfg::Color &c);
-       
-void render_color_to_window(const Glib::RefPtr<Gdk::Drawable>& window,const Gdk::Rectangle& ca,const sinfg::Color &color);
+Gdk::Color colorconv_synfig2gdk(const synfig::Color &c);
+
+void render_color_to_window(const Glib::RefPtr<Gdk::Drawable>& window,const Gdk::Rectangle& ca,const synfig::Color &color);
 
 class Widget_Color : public Gtk::DrawingArea
 {
-       sinfg::Color color;
-       
+       synfig::Color color;
+
        sigc::signal<void> signal_activate_;
        sigc::signal<void> signal_secondary_;
 
@@ -59,9 +60,9 @@ public:
        sigc::signal<void>& signal_activate() { return signal_activate_; }
        sigc::signal<void>& signal_clicked() { return signal_activate_; }
        sigc::signal<void>& signal_secondary() { return signal_secondary_; }
-       
-       void set_value(const sinfg::Color &data);
-       const sinfg::Color &get_value();
+
+       void set_value(const synfig::Color &data);
+       const synfig::Color &get_value();
        Widget_Color();
        ~Widget_Color();
 private:
@@ -69,7 +70,7 @@ private:
        bool on_event(GdkEvent *event);
 
 }; // END of class Widget_Color
-       
+
 }; // END of namespace studio
 
 /* === E N D =============================================================== */