X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=src%2Fselection.h;h=1dcaa53ff3d836082dc63d253d128dcd6171b524;hb=4cc63b00182b8f4b23705a6da086b601a2b5a646;hp=be8cd8aff520aac35e2b7e74832eafe644f89637;hpb=46e288e75cd7b4d376ace88c57aec3b47a148a20;p=inkscape.git

diff --git a/src/selection.h b/src/selection.h
index be8cd8aff..1dcaa53ff 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -17,6 +17,7 @@
  */
 
 #include <vector>
+#include <map>
 #include <sigc++/sigc++.h>
 
 #include "libnr/nr-rect.h"
@@ -275,7 +276,7 @@ public:
      * @return A vector containing the 2 (top-left and bottom-right)
      * corners of the selection bounding box.
      */
-    std::vector<NR::Point> Selection::getBBoxPointsOuter() const;
+    std::vector<NR::Point> getBBoxPointsOuter() const;
 
     /**
      * @brief Connects a slot to be notified of selection changes
@@ -318,11 +319,7 @@ private:
     /** @brief Issues modification notification signals */
     static gboolean _emit_modified(Selection *selection);
     /** @brief Schedules an item modification signal to be sent */
-    static void _schedule_modified(SPObject *obj, guint flags, Selection *selection);
-    /** @brief Releases a selected object that is being removed */
-    static void _release(SPObject *obj, Selection *selection);
-    /** @brief Releases an active layer object that is being removed */
-    static void _releaseSelectionContext(SPObject *obj, Selection *selection);
+    void _schedule_modified(SPObject *obj, guint flags);
 
     /** @brief Issues modified selection signal */
     void _emitModified(guint flags);
@@ -352,10 +349,13 @@ private:
 
     GC::soft_ptr<SPDesktop> _desktop;
     SPObject* _selection_context;
-    gulong _context_release_handler_id;
     guint _flags;
     guint _idle;
 
+    std::map<SPObject *, sigc::connection> _modified_connections;
+    std::map<SPObject *, sigc::connection> _release_connections;
+    sigc::connection _context_release_connection;
+
     sigc::signal<void, Selection *> _changed_signal;
     sigc::signal<void, Selection *, guint> _modified_signal;
 };