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

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

diff --git a/synfig-studio/tags/stable/src/gtkmm/dock_navigator.h b/synfig-studio/tags/stable/src/gtkmm/dock_navigator.h
index 94c145c..95e3fa1 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/dock_navigator.h
+++ b/synfig-studio/tags/stable/src/gtkmm/dock_navigator.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file dock_navigator.h
 **     \brief Navigator Dock Header
 **
-**     $Id: dock_navigator.h,v 1.3 2005/01/12 00:31:11 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_DOCK_NAVIGATOR_H
-#define __SINFG_DOCK_NAVIGATOR_H
+#ifndef __SYNFIG_DOCK_NAVIGATOR_H
+#define __SYNFIG_DOCK_NAVIGATOR_H
 
 /* === H E A D E R S ======================================================= */
 #include "sigc++/signal.h"
@@ -32,7 +33,7 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/label.h>
 
-#include <sinfg/renddesc.h>
+#include <synfig/renddesc.h>
 
 #include "canvasview.h"
 #include "dock_canvasspecific.h"
@@ -48,50 +49,50 @@
 
 namespace studio {
 class AsyncRenderer;
-       
+
 class Widget_NavView : public Gtk::Table
 {
        //handle to out parent canvas
        CanvasView::LooseHandle         canvview;
-       
+
        Glib::RefPtr<Gdk::Pixbuf>       prev;
        bool dirty;
-       
-       //The drawing stuff     
+
+       //The drawing stuff
        Gtk::DrawingArea        drawto;
-       
+
        //The input stuff
        Gtk::Adjustment         adj_zoom;
        Gtk::Label                      zoom_print;
-       
+
        //zoom window stuff
        bool                            scrolling;
-       
-       //asyncronous rendering stuff
+
+       //asynchronous rendering stuff
        etl::handle<AsyncRenderer>      renderer;
-       etl::smart_ptr<sinfg::Surface> surface;
+       etl::smart_ptr<synfig::Surface> surface;
        bool                                            rendering;
-       
+
        //drawing functionality
        void on_start_render(); //breaks out into asynchronous rendering
        void on_finish_render();
        void on_draw(); //renders the small thing we have
        void on_dirty_preview(); //dirties the preview for rerender
-       
+
        //for the zoom buttons
        void on_zoom_in();
        void on_zoom_out();
-       
+
        //handles the zoom scroller
        bool on_scroll_event(GdkEvent *event);
        void on_number_modify();
-       
+
        //
        bool on_mouse_event(GdkEvent * e);
-       
+
        //draws the gotten bitmap on the draw area
        bool on_expose_draw(GdkEventExpose *exp=0);
-       
+
        //for when the canvasview view changes (boolean value scrolling solves cyclic problems)
        void on_workarea_view_change();
 
@@ -101,18 +102,18 @@ public:
 
        etl::loose_handle<studio::CanvasView> get_canvas_view() {return canvview;}
 };
-       
+
 class Dock_Navigator : public Dock_CanvasSpecific
 {
        Widget_NavView  dummy;
-               
+
 public:
        Dock_Navigator();
        ~Dock_Navigator();
 
        virtual void changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view);
 };
-       
+
 }; // END of namespace studio
 
 /* === E N D =============================================================== */