aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2007-09-10 22:28:42 +0000
committerBill Meier <wmeier@newsguy.com>2007-09-10 22:28:42 +0000
commit5efc608d286bb8218aa2401e01cd42e86144be6c (patch)
treec79f0deda77f86ed422477aed47ba4f7f49e82bc /gtk
parent4e49ad6771aa02844e3c17c47e8606d9b170ff60 (diff)
Fix bug in View ! Color Filter ! New ! (Fore|Back)ground Color & etc code
which resulted in a GtkCritcal msg and in disabling the "(Fore|Back)ground Color" button when esc used to close the widget. svn path=/trunk/; revision=22840
Diffstat (limited to 'gtk')
-rw-r--r--gtk/color_edit_dlg.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c
index 7c9fcf304f..7ed301cd06 100644
--- a/gtk/color_edit_dlg.c
+++ b/gtk/color_edit_dlg.c
@@ -484,7 +484,10 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg)
color_sel_cancel = GTK_COLOR_SELECTION_DIALOG (color_sel_win)->cancel_button;
OBJECT_SET_DATA(color_sel_win, "color_sel_cancel", color_sel_cancel);
GTK_WIDGET_SET_FLAGS (color_sel_cancel, GTK_CAN_DEFAULT);
-
+ window_set_cancel_button(color_sel_win, color_sel_cancel, NULL); /* ensure esc does req'd local cxl action. */
+ /* esc as handled by the */
+ /* gtk_color_selection_dialog widget */
+ /* doesn't result in this happening. */
color_sel_help = GTK_COLOR_SELECTION_DIALOG (color_sel_win)->help_button;
OBJECT_SET_DATA(color_sel_win, "color_sel_help", color_sel_help);