Added return value to remove

(bzr r14954.1.5)

4 files changed, 12 insertions, 20 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 92436ea9a..a758691af 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -515,17 +515,6 @@ add_library(inkscape_base SHARED ${inkscape_SRC} ${sp_SRC})
 add_executable(inkscape ${main_SRC} )
 add_executable(inkview inkview.cpp )
 
-
-
-if(UNIX)
-# message after building.
-add_custom_command(
-    TARGET inkscape
-    POST_BUILD MAIN_DEPENDENCY inkscape
-    COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${CMAKE_INSTALL_PREFIX}'
-)
-endif()
-
 add_dependencies(inkscape inkscape_version)
 
 if(WITH_DBUS)
diff --git a/src/object-set.cpp b/src/object-set.cpp
index df4bc1435..ba7999c19 100644
--- a/src/object-set.cpp
+++ b/src/object-set.cpp
@@ -9,6 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <sigc++/sigc++.h>
 #include "object-set.h"
 
 bool ObjectSet::add(SPObject* object) {
@@ -27,24 +28,21 @@ bool ObjectSet::add(SPObject* object) {
     return true;
 }
 
-void ObjectSet::remove(SPObject* object) {
+bool ObjectSet::remove(SPObject* object) {
     // object is the top of subtree
     if (contains(object)) {
         _remove(object);
-        // TODO
-//        return true;
+        return true;
     }
 
     // any ancestor of object is in the set
     if (_anyAncestorIsInSet(object)) {
         _removeAncestorsFromSet(object);
-        // TODO
-//        return true;
+        return true;
     }
 
     // no object nor any parent in the set
-    // TODO
-//    return false;
+    return false;
 }
 
 bool ObjectSet::contains(SPObject* object) {
@@ -92,7 +90,7 @@ void ObjectSet::_remove(SPObject *object) {
 }
 
 void ObjectSet::_add(SPObject *object) {
-    releaseConnections[object] = object->connectRelease(sigc::mem_fun(*this, &ObjectSet::remove));
+    releaseConnections[object] = object->connectRelease(sigc::hide_return(sigc::mem_fun(*this, &ObjectSet::remove)));
     container.push_back(object);
 }
 
diff --git a/src/object-set.h b/src/object-set.h
index 2b9c5efe3..8160cd27b 100644
--- a/src/object-set.h
+++ b/src/object-set.h
@@ -37,7 +37,7 @@ public:
     ObjectSet() {};
     ~ObjectSet();
     bool add(SPObject* object);
-    void remove(SPObject* object);
+    bool remove(SPObject* object);
     bool contains(SPObject* object);
     void clear();
     int size();
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index abac2c091..36fe26e76 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -683,6 +683,11 @@ bool ToolBase::root_handler(GdkEvent* event) {
             }
             break;
 
+        case GDK_KEY_Menu:
+            sp_event_root_menu_popup(desktop, NULL, event);
+            ret = TRUE;
+            break;
+
         case GDK_KEY_F10:
             if (MOD__SHIFT_ONLY(event)) {
                 sp_event_root_menu_popup(desktop, NULL, event);