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

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

diff --git a/synfig-studio/tags/stable/src/gtkmm/widget_waypoint.h b/synfig-studio/tags/stable/src/gtkmm/widget_waypoint.h
index 5a45f3e..be87119 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/widget_waypoint.h
+++ b/synfig-studio/tags/stable/src/gtkmm/widget_waypoint.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
-/*!    \file dialog_waypoint.h
+/* === S Y N F I G ========================================================= */
+/*!    \file widget_waypoint.h
 **     \brief Template Header
 **
-**     $Id: widget_waypoint.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_WIDGET_WAYPOINT_H
-#define __SINFG_GTKMM_WIDGET_WAYPOINT_H
+#ifndef __SYNFIG_GTKMM_WIDGET_WAYPOINT_H
+#define __SYNFIG_GTKMM_WIDGET_WAYPOINT_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -36,20 +37,19 @@
 #include <gtkmm/table.h>
 #include <gtkmm/button.h>
 //#include <gtkmm/progressbar.h>
-//#include <atkmm/stateset.h>
 //#include <gtkmm/paned.h>
 #include <gtkmm/box.h>
 //#include <gtkmm/scrollbar.h>
 #include <gtkmm/combo.h>
 #include <gtkmm/optionmenu.h>
 #include <gtkmm/spinbutton.h>
+#include <gtkmm/alignment.h>
 
-
-#include <sinfgapp/value_desc.h>
-#include <sinfg/waypoint.h>
-//#include <sinfg/valuenode_dynamiclist.h>
-#include <sinfg/string.h>
-#include <sinfg/time.h>
+#include <synfigapp/value_desc.h>
+#include <synfig/waypoint.h>
+//#include <synfig/valuenode_dynamiclist.h>
+#include <synfig/string.h>
+#include <synfig/time.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -64,14 +64,14 @@ class Widget_ValueBase;
 class Widget_Time;
 class Widget_Waypoint;
 
-class Widget_Waypoint : public Gtk::Table
+class Widget_Waypoint : public Gtk::Alignment
 {
     Widget_ValueBase *value_widget;
        Gtk::Label *value_node_label;
        Gtk::Label *label;
        Widget_Time *time_widget;
-       mutable sinfg::Waypoint waypoint;
-       sinfg::Canvas::Handle canvas;
+       mutable synfig::Waypoint waypoint;
+       synfig::Canvas::Handle canvas;
        //Gtk::Adjustment time_adjustment;
 
        Gtk::Combo *in,*out;
@@ -83,10 +83,10 @@ class Widget_Waypoint : public Gtk::Table
 //     Gtk::ComboDropDownItem item;
 
 public:
-       Widget_Waypoint(etl::handle<sinfg::Canvas> canvas);
-       void set_canvas(sinfg::Canvas::Handle x);
-       void set_waypoint(sinfg::Waypoint &x);
-       const sinfg::Waypoint &get_waypoint()const;
+       Widget_Waypoint(etl::handle<synfig::Canvas> canvas);
+       void set_canvas(synfig::Canvas::Handle x);
+       void set_waypoint(synfig::Waypoint &x);
+       const synfig::Waypoint &get_waypoint()const;
 }; // END of class Widget_Waypoint
 
 }; // END of namespace studio