Check to make sure canvas provided to forced redraw functions is not null.

[inkscape.git] / src / layer-manager.h

diff --git a/src/layer-manager.h b/src/layer-manager.h
index b4d827089ce0238d401289c92d22be649a21f5db..0dec95c978b82218ab985715c1f344c9fcc40f73 100644 (file)
--- a/src/layer-manager.h
+++ b/src/layer-manager.h
@@ -13,6 +13,8 @@
 #include "document-subset.h"
 #include "gc-finalized.h"
 #include "gc-soft-ptr.h"
+#include <vector>
+#include <map>
 
 class SPDesktop;
 class SPDocument;
@@ -25,6 +27,9 @@ class LayerManager : public DocumentSubset,
 public:
     LayerManager(SPDesktop *desktop);
 
+    void setCurrentLayer( SPObject* obj );
+    void renameLayer( SPObject* obj, gchar const *label );
+
     sigc::connection connectCurrentLayerChanged(const sigc::slot<void, SPObject *> & slot) {
        return _layer_changed_signal.connect(slot);
     }
@@ -34,7 +39,8 @@ public:
     }
 
 private:
-    static void _objectModifiedCB( SPObject* obj, guint flags, LayerManager* mgr );
+    friend class LayerWatcher;
+    class LayerWatcher;
 
     void _objectModified( SPObject* obj, guint flags );
     void _setDocument(SPDocument *document);
@@ -48,6 +54,8 @@ private:
     GC::soft_ptr<SPDesktop> _desktop;
     SPDocument *_document;
 
+    std::vector<LayerWatcher*> _watchers;
+
     sigc::signal<void, SPObject *>     _layer_changed_signal;
     sigc::signal<void, SPObject *>     _details_changed_signal;
 };