summaryrefslogtreecommitdiff
path: root/gtk2_ardour/utils.cc
diff options
context:
space:
mode:
authorNick Mainsbridge <beatroute@iprimus.com.au>2008-09-20 18:22:24 +0000
committerNick Mainsbridge <beatroute@iprimus.com.au>2008-09-20 18:22:24 +0000
commita868e7b26067bbe078462dbd736cf565e8f109ef (patch)
treec7683408995e6de72be6fe454a75e7cce97145be /gtk2_ardour/utils.cc
parenta31775baf1c832d6e06fa7b2459ccb3c7356ceb5 (diff)
Use events from gtk trunk, update immediately on scroll for osx as well.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3775 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/utils.cc')
-rw-r--r--gtk2_ardour/utils.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index c5faef2b0c..5ceacc48e1 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -396,7 +396,7 @@ set_color (Gdk::Color& c, int rgb)
c.set_rgb((rgb >> 16)*256, ((rgb & 0xff00) >> 8)*256, (rgb & 0xff)*256);
}
-#ifdef GTKOSX
+#ifdef GTKOSX_ARDOUR_EVENTS_PATCH
extern "C" {
gboolean gdk_quartz_possibly_forward (GdkEvent*);
}
@@ -473,7 +473,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
return true;
}
-#ifdef GTKOSX
+#ifdef GTKOSX_ARDOUR_EVENTS_PATCH
int oldval = ev->keyval;
ev->keyval = fakekey;
if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) {
@@ -497,7 +497,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
cerr << "\tactivate, then propagate\n";
}
#endif
-#ifdef GTKOSX
+#ifdef GTKOSX_ARDOUR_EVENTS_PATCH
if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) {
return true;
}
@@ -532,7 +532,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
cerr << "\tpropagation didn't handle, so activate\n";
}
#endif
-#ifdef GTKOSX
+#ifdef GTKOSX_ARDOUR_EVENTS_PATCH
if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) {
return true;
}