diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-10-26 11:30:48 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-10-26 11:30:48 +0000 |
| commit | 7f927ca0eb022e909cde38c077944bd901f18d7a (patch) | |
| tree | a44534391110638f9fa8ef57662ba5b4d677353a /gtk2_ardour | |
| parent | 11d77d62030c16f5e13dcc8258b8628d919f4a0a (diff) | |
Unbreak linux build (sorry about that folks).
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4014 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/utils.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 0ca7615599..c5faef2b0c 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -396,9 +396,11 @@ set_color (Gdk::Color& c, int rgb) c.set_rgb((rgb >> 16)*256, ((rgb & 0xff00) >> 8)*256, (rgb & 0xff)*256); } +#ifdef GTKOSX extern "C" { gboolean gdk_quartz_possibly_forward (GdkEvent*); } +#endif bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) @@ -471,12 +473,14 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) return true; } +#ifdef GTKOSX int oldval = ev->keyval; ev->keyval = fakekey; if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) { return true; } ev->keyval = oldval; +#endif } } @@ -493,9 +497,11 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) cerr << "\tactivate, then propagate\n"; } #endif +#ifdef GTKOSX if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) { return true; } +#endif if (!gtk_window_activate_key (win, ev)) { #ifdef DEBUG_ACCELERATOR_HANDLING if (debug) { @@ -526,9 +532,11 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) cerr << "\tpropagation didn't handle, so activate\n"; } #endif +#ifdef GTKOSX if (gdk_quartz_possibly_forward ((GdkEvent*) ev)) { return true; } +#endif return gtk_window_activate_key (win, ev); } else { #ifdef DEBUG_ACCELERATOR_HANDLING |