Fix multiple selection with Ctrl-Click in DnDVBox.

git-svn-id: svn://localhost/ardour2/branches/3.0@8070 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index d5382d37b22bf58aa28ef60c4bf5cc779b62999e..05fac975791f145a059c052553b5349535304dfc 100644 (file)
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -29,11 +29,11 @@
 #include <gtkmm/eventbox.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/scrolledwindow.h>
-#include <gtkmm2ext/dndtreeview.h>
-#include <gtkmm2ext/auto_spin.h>
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/dndvbox.h>
-#include <gtkmm2ext/pixfader.h>
+#include "gtkmm2ext/dndtreeview.h"
+#include "gtkmm2ext/auto_spin.h"
+#include "gtkmm2ext/click_box.h"
+#include "gtkmm2ext/dndvbox.h"
+#include "gtkmm2ext/pixfader.h"
 
 #include "pbd/stateful.h"
 #include "pbd/signals.h"

diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h
index 486f31f0842af57ac68c497821d13ba06c9ef062..ff3b2ef3556ffa945efa0097cfd4fa0a4976adcb 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h
+++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h
@@ -253,7 +253,9 @@ private:
                        
                if (ev->button == 1 || ev->button == 3) {
                        if (!selected (child)) {
-                               clear_selection ();
+                               if ((ev->state & Gdk::CONTROL_MASK) == 0) {
+                                       clear_selection ();
+                               }
                                if (child) {
                                        add_to_selection (child);
                                }