diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-09-25 05:12:44 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-09-25 05:12:44 +0000 |
| commit | e0c67e1a1b4a23943a7e89e124a388ed442f3fd5 (patch) | |
| tree | 3c20deaeb562b5c3a8386684efb895db7f41850e /gtk/color_edit_dlg.c | |
| parent | c45477aace199e26215d3760e890feb97f511ea3 (diff) | |
In newer versions of GTK+ 2.x, if you have the mouse positioned above a
button that goes from insensitive to sensitive, the button won't respond
to mouse clicks.
This caused the Coloring Rules dialog behavior reported in bug 699. Work
around it by not making the up/down buttons insensitive while we're moving
a rule.
Fixup whitespace.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22946 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/color_edit_dlg.c')
| -rw-r--r-- | gtk/color_edit_dlg.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c index f53ac67eb4..59138103b0 100644 --- a/gtk/color_edit_dlg.c +++ b/gtk/color_edit_dlg.c @@ -44,19 +44,13 @@ #include "color_edit_dlg.h" -/* XXX - ugly workaround for bug #699 */ -/* the "Up"/"Down" buttons of the GTK2.x version doesn't work properly */ -/* simply use the GTK1.x version of this dialog for now ... */ #if GTK_MAJOR_VERSION >= 2 -#undef GTK_MAJOR_VERSION -#define GTK_MAJOR_VERSION 1 #define BUTTON_SIZE_X -1 #define BUTTON_SIZE_Y -1 #else #define BUTTON_SIZE_X 50 #define BUTTON_SIZE_Y 20 #endif -/* XXX - ugly workaround for bug #699 */ #if GTK_MAJOR_VERSION < 2 @@ -95,7 +89,7 @@ filter_expr_cb(GtkWidget *w _U_, gpointer filter_te) dfilter_expr_dlg_new(GTK_WIDGET(filter_te)); } - + /* Create an "Edit Color Filter" dialog for a given color filter, and associate it with that color filter. */ void @@ -149,7 +143,7 @@ edit_color_filter_dialog(GtkWidget *color_filters, /* dialog window */ edit_dialog = dlg_window_new ("Wireshark: Edit Color Filter"); - gtk_window_set_default_size(GTK_WINDOW(edit_dialog), 500, -1); + gtk_window_set_default_size(GTK_WINDOW(edit_dialog), 500, -1); OBJECT_SET_DATA(edit_dialog, "edit_dialog", edit_dialog); colorf->edit_dialog = edit_dialog; @@ -450,7 +444,7 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg) colorf->filter_name); } else { color = &colorf->fg_color; - title = g_strdup_printf("Wireshark: Choose foreground color for \"%s\"", + title = g_strdup_printf("Wireshark: Choose foreground color for \"%s\"", colorf->filter_name); } color_sel_win = gtk_color_selection_dialog_new(title); |