diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-15 18:04:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-15 18:04:23 +0000 |
| commit | 54d9f2f2d83af1f0f44579fe2ebf090e68259938 (patch) | |
| tree | 44a61c36048be6edabeb5fc5461d47c95623f79f /gtk2_ardour/processor_box.cc | |
| parent | ece2bacb2c7d7f72b6a25a75760837efce0d5e30 (diff) | |
first half of the mega-by-hand-commit-by-commit merge from 2.X
git-svn-id: svn://localhost/ardour2/branches/3.0@4980 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/processor_box.cc')
| -rw-r--r-- | gtk2_ardour/processor_box.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 886f594ad4..627bada571 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -346,9 +346,13 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev) show_processor_menu(ev->time); ret = true; - } else if (processor && Keyboard::is_button2_event (ev) && (Keyboard::no_modifier_keys_pressed (ev) && ((ev->state & Gdk::BUTTON2_MASK) == Gdk::BUTTON2_MASK))) { - - /* button2-click with no modifiers */ + } else if (processor && Keyboard::is_button2_event (ev) +#ifndef GTKOSX + && (Keyboard::no_modifier_keys_pressed (ev) && ((ev->state & Gdk::BUTTON2_MASK) == Gdk::BUTTON2_MASK)) +#endif + ) { + + /* button2-click with no/appropriate modifiers */ if (processor->active()) { processor->deactivate (); |