diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-11-25 00:58:05 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-11-25 00:58:05 +0000 |
| commit | ba3a704d7b4e52a3d9f1ef2721291ad1f3201764 (patch) | |
| tree | c611df643bb34b3959882a1fcf661bd559b7575c /gtk2_ardour | |
| parent | f6b5444ebf2e85d28da5293c582babc343ff4d31 (diff) | |
if using a top-menubar (e.g. OS X), don't quit when editor window is closed via WM close button
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4248 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/SAE-de-keypad.bindings.in | 3 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_dependents.cc | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/SAE-de-keypad.bindings.in b/gtk2_ardour/SAE-de-keypad.bindings.in index aadeffea32..e8e3e1b338 100644 --- a/gtk2_ardour/SAE-de-keypad.bindings.in +++ b/gtk2_ardour/SAE-de-keypad.bindings.in @@ -9,6 +9,8 @@ (gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<%PRIMARY%>period") (gtk_accel_path "<Actions>/Transport/record-roll" "<%PRIMARY%>space") +(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%PRIMARY%>,") + (gtk_accel_path "<Actions>/Editor/align-regions-end" "<%PRIMARY%><%SECONDARY%>less") (gtk_accel_path "<Actions>/Editor/align-regions-end-relative" "<%PRIMARY%>less") (gtk_accel_path "<Actions>/Editor/align-regions-start" "<%LEVEL4%><%SECONDARY%>less") @@ -61,7 +63,6 @@ (gtk_accel_path "<Actions>/Editor/insert-region" "i") (gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%PRIMARY%>i") (gtk_accel_path "<Actions>/Editor/invert-selection" "<%TERTIARY%>i") -(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%SECONDARY%>o") (gtk_accel_path "<Actions>/Main/Open" "<%PRIMARY%>o") (gtk_accel_path "<Actions>/Main/Recent" "<%PRIMARY%><%TERTIARY%>o") (gtk_accel_path "<Actions>/Editor/naturalize-region" "<%LEVEL4%>o") diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index dff6cec698..36d2154c46 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -125,6 +125,13 @@ ARDOUR_UI::toggle_editor_mixer_on_top () gint ARDOUR_UI::exit_on_main_window_close (GdkEventAny *ev) { +#ifdef TOP_MENUBAR + /* just hide the window, and return - the top menu stays up */ + editor->hide (); + return TRUE; +#else + /* time to get out of here */ finish(); return TRUE; +#endif } |