summaryrefslogtreecommitdiff
path: root/gtk2_ardour/theme_manager.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/theme_manager.cc')
-rw-r--r--gtk2_ardour/theme_manager.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 1f333058ed..c48b8a494f 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -639,6 +639,8 @@ ThemeManager::alias_palette_event (GdkEvent* ev, string new_alias, string target
void
ThemeManager::alias_palette_response (int response, std::string target_name, std::string old_alias)
{
+ cerr << "palette response: " << response << endl;
+
switch (response) {
case GTK_RESPONSE_OK:
case GTK_RESPONSE_ACCEPT:
@@ -646,10 +648,15 @@ ThemeManager::alias_palette_response (int response, std::string target_name, std
setup_aliases ();
break;
- default:
+
+ case GTK_RESPONSE_REJECT:
/* revert choice */
ARDOUR_UI::instance()->config()->set_alias (target_name, old_alias);
break;
+
+ default:
+ /* do nothing */
+ break;
}
palette_window->hide ();
@@ -668,7 +675,7 @@ ThemeManager::choose_color_from_palette (string const & name)
delete palette_window;
palette_window = new ArdourDialog (_("Color Palette"));
- palette_window->add_button (Stock::CANCEL, RESPONSE_CANCEL);
+ palette_window->add_button (Stock::CANCEL, RESPONSE_REJECT); /* using CANCEL causes confusion if dialog is closed via CloseAllDialogs */
palette_window->add_button (Stock::OK, RESPONSE_OK);
ArdourCanvas::GtkCanvas* canvas = new ArdourCanvas::GtkCanvas ();