diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-10-26 08:27:30 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-10-26 08:27:30 +0000 |
| commit | 11d77d62030c16f5e13dcc8258b8628d919f4a0a (patch) | |
| tree | 2c52d967c3cdfc0594e12bc5c2dc3274fc1511f4 /gtk2_ardour/utils.cc | |
| parent | 4e8d29ce242277d95ea32f9c89878cb82dbe2a90 (diff) | |
Add gyk-osx.patch to repo, remove #ifdefs made obsolete by the patch.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4013 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/utils.cc')
| -rw-r--r-- | gtk2_ardour/utils.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 5ceacc48e1..0ca7615599 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -396,11 +396,9 @@ set_color (Gdk::Color& c, int rgb) c.set_rgb((rgb >> 16)*256, ((rgb & 0xff00) >> 8)*256, (rgb & 0xff)*256); } -#ifdef GTKOSX_ARDOUR_EVENTS_PATCH extern "C" { gboolean gdk_quartz_possibly_forward (GdkEvent*); } -#endif bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) @@ -473,14 +471,12 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) return true; } -#ifdef GTKOSX_ARDOUR_EVENTS_PATCH int oldval = ev->keyval; ev->keyval = fakekey; if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) { return true; } ev->keyval = oldval; -#endif } } @@ -497,11 +493,9 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) cerr << "\tactivate, then propagate\n"; } #endif -#ifdef GTKOSX_ARDOUR_EVENTS_PATCH if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) { return true; } -#endif if (!gtk_window_activate_key (win, ev)) { #ifdef DEBUG_ACCELERATOR_HANDLING if (debug) { @@ -532,11 +526,9 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) cerr << "\tpropagation didn't handle, so activate\n"; } #endif -#ifdef GTKOSX_ARDOUR_EVENTS_PATCH if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) { return true; } -#endif return gtk_window_activate_key (win, ev); } else { #ifdef DEBUG_ACCELERATOR_HANDLING |