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

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

diff --git a/synfig-studio/tags/stable/src/gtkmm/dock_history.h b/synfig-studio/tags/stable/src/gtkmm/dock_history.h
index 495dd59..00154b2 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/dock_history.h
+++ b/synfig-studio/tags/stable/src/gtkmm/dock_history.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
-/*!    \file dialog_history.h
+/* === S Y N F I G ========================================================= */
+/*!    \file dock_history.h
 **     \brief Template Header
 **
-**     $Id: dock_history.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_STUDIO_DIALOG_HISTORY_H
-#define __SINFG_STUDIO_DIALOG_HISTORY_H
+#ifndef __SYNFIG_STUDIO_DIALOG_HISTORY_H
+#define __SYNFIG_STUDIO_DIALOG_HISTORY_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -41,11 +42,16 @@
 namespace studio {
 
 class Dock_History : public Dock_CanvasSpecific
-{      
+{
        Glib::RefPtr<Gtk::ActionGroup> action_group;
        Gtk::TreeView *action_tree;
 
        etl::loose_handle<studio::Instance>     selected_instance;
+
+       sigc::connection on_undo_tree_changed_connection;
+
+       void on_undo_tree_changed();
+
        void set_selected_instance_(etl::handle<studio::Instance> x);
 
 
@@ -63,12 +69,13 @@ public:
 
        void clear_undo();
        void clear_redo();
+       void clear_undo_and_redo();
 
        bool on_action_event(GdkEvent *event);
        void on_action_toggle(const Glib::ustring& path);
 
        void update_undo_redo();
-       
+
        Dock_History();
        ~Dock_History();
 protected: