family name field on svgfonts dialog now properly saves attribute. Should do the...

[inkscape.git] / src / ui / dialog / undo-history.h

diff --git a/src/ui/dialog/undo-history.h b/src/ui/dialog/undo-history.h
index 19c5740a42c7a121355cd721507dafd712c9e6d8..070a1eb22b77e332c1970749271ee063cb9e967b 100644 (file)
--- a/src/ui/dialog/undo-history.h
+++ b/src/ui/dialog/undo-history.h
@@ -2,7 +2,7 @@
  * Undo History dialog
  *
  * \brief A dialog for presenting an event log of commited, undone and redone events. Allows the
- * user to undo and redo multiple events in a more convinient way than repateaded ctrl-z,
+ * user to undo and redo multiple events in a more convenient way than repateaded ctrl-z,
  * ctrl-shift-z.
  *
  *
@@ -29,9 +29,10 @@
 #include <functional>
 #include <sstream>
 
-#include "dialog.h"
+#include "desktop.h"
 #include "event-log.h"
 
+#include "ui/widget/panel.h"
 #include "widgets/icon.h"
 
 namespace Inkscape {
@@ -107,7 +108,7 @@ private:
     Glib::Property<int> _property_number;
     const Filter& _filter;
 
-    struct NoFilter : Filter { bool operator() (const int& x) const { return true; } };
+    struct NoFilter : Filter { bool operator() (const int& /*x*/) const { return true; } };
 };
 
 
@@ -115,11 +116,14 @@ private:
  * 
  */
 
-class UndoHistory : public Dialog {
+class UndoHistory : public Widget::Panel {
 public:
     virtual ~UndoHistory();
 
-    static UndoHistory *create() { return new UndoHistory(); }
+    static UndoHistory &getInstance();
+    void setDesktop(SPDesktop* desktop);
+
+    sigc::connection _document_replaced_connection;
 
 protected:
 
@@ -141,9 +145,9 @@ protected:
     void _onCollapseEvent(const Gtk::TreeModel::iterator &iter, const Gtk::TreeModel::Path &path);
 
 private:
+    UndoHistory();
   
     // no default constructor, noncopyable, nonassignable
-    UndoHistory();
     UndoHistory(UndoHistory const &d);
     UndoHistory operator=(UndoHistory const &d);
 
@@ -156,7 +160,6 @@ private:
     static const CellRendererInt::Filter& greater_than_1;
 };
 
-
 } // namespace Dialog
 } // namespace UI
 } // namespace Inkscape