Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

[ardour.git] / libs / gtkmm2ext / selector.cc

diff --git a/libs/gtkmm2ext/selector.cc b/libs/gtkmm2ext/selector.cc
index 7302de66e72f82bb9817de8872ecd79773c8243f..e4b95d1e032b1c5fa2fea87d25110ebec8e8da2f 100644 (file)
--- a/libs/gtkmm2ext/selector.cc
+++ b/libs/gtkmm2ext/selector.cc
@@ -22,9 +22,14 @@
 #include <vector>
 #include <string>
 
-#include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/utils.h>
-#include <pbd/pathscanner.h>
+#include <glibmm.h>
+#include <gdkmm.h>
+
+#include "pbd/pathscanner.h"
+
+#include "gtkmm2ext/keyboard.h"
+#include "gtkmm2ext/selector.h"
+#include "gtkmm2ext/utils.h"
 
 using namespace std;
 using namespace Gtkmm2ext;
@@ -219,14 +224,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);
                }
        }