diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-09-10 22:28:42 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-09-10 22:28:42 +0000 |
| commit | e12fc235f67454192c650c18366b46185d635542 (patch) | |
| tree | c79f0deda77f86ed422477aed47ba4f7f49e82bc /gtk | |
| parent | d89294cd80090a957d947b789adb58b13154fe5d (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22840 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/color_edit_dlg.c | 5 |
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); |