X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fselector.cc;h=97f468707b39291a0efead8aff14787aefb4379d;hb=68146a09698772eaaab2b3a46cb1c9866acb4200;hp=00db129d6be3893ddc0b83eeb5aaf1161e56dfbd;hpb=5a52d8fee4c9abac7ffb1f1e6464785d979acd68;p=ardour.git

diff --git a/libs/gtkmm2ext/selector.cc b/libs/gtkmm2ext/selector.cc
index 00db129d6b..97f468707b 100644
--- a/libs/gtkmm2ext/selector.cc
+++ b/libs/gtkmm2ext/selector.cc
@@ -22,10 +22,12 @@
 #include <vector>
 #include <string>
 
-#include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/utils.h>
-#include <pbd/pathscanner.h>
-#include <pbd/error.h>
+#include <glibmm.h>
+#include <gdkmm.h>
+
+#include "gtkmm2ext/keyboard.h"
+#include "gtkmm2ext/selector.h"
+#include "gtkmm2ext/utils.h"
 
 using namespace std;
 using namespace Gtkmm2ext;
@@ -220,14 +222,14 @@ TreeView_Selector::on_button_press_event(GdkEventButton* ev)
 	bool return_value = TreeView::on_button_press_event(ev);
 
 	if (ev && (ev->type == GDK_BUTTON_RELEASE || ev->type == GDK_2BUTTON_PRESS)) {
-		if (ev->state & Gdk::CONTROL_MASK) {
-			gtk_idle_add (Selector::_control_clicked, this);
-		} else if (ev->state & Gdk::SHIFT_MASK) {
-			gtk_idle_add (Selector::_shift_clicked, this);
+		if (ev->state & Keyboard::PrimaryModifier) {
+			g_idle_add (Selector::_control_clicked, this);
+		} else if (ev->state & Keyboard::TertiaryModifier) {
+			g_idle_add (Selector::_shift_clicked, this);
 		} else if (ev->type == GDK_2BUTTON_PRESS) {
-			gtk_idle_add (Selector::_accept, this);
+			g_idle_add (Selector::_accept, this);
 		} else {
-			gtk_idle_add (Selector::_chosen, this);
+			g_idle_add (Selector::_chosen, this);
 		}
 	}