diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2013-03-28 06:36:44 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2013-03-28 06:36:44 +0000 |
| commit | 42c71a3261581caafa1be74105e9f910559d3a52 (patch) | |
| tree | f006d9504c5e6008a48af8d8cc88356de237b1e0 /ui/gtk/color_edit_dlg.c | |
| parent | aee73d6d9e101927150b1ca3a16d404b50196366 (diff) | |
| download | wireshark-42c71a3261581caafa1be74105e9f910559d3a52.tar.gz | |
Follow up on bug 8416.
Remove C++ incompatibilities in GTK+ 3 code.
svn path=/trunk/; revision=48606
Diffstat (limited to 'ui/gtk/color_edit_dlg.c')
| -rw-r--r-- | ui/gtk/color_edit_dlg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c index 25a62862da..0afdd00e58 100644 --- a/ui/gtk/color_edit_dlg.c +++ b/ui/gtk/color_edit_dlg.c @@ -418,8 +418,8 @@ color_edit_dlg_ok_cb(GtkWidget *w _U_, gpointer user_data) context = gtk_widget_get_style_context (cedi->filt_name_entry); - gtk_style_context_get_color(context, GTK_STATE_NORMAL, &new_rgba_fg_color); /* aka foreground color */ - gtk_style_context_get_background_color(context, GTK_STATE_NORMAL, &new_rgba_bg_color); + gtk_style_context_get_color(context, (GtkStateFlags)GTK_STATE_NORMAL, &new_rgba_fg_color); /* aka foreground color */ + gtk_style_context_get_background_color(context, (GtkStateFlags)GTK_STATE_NORMAL, &new_rgba_bg_color); gdkRGBAcolor_to_color_t(&colorf->fg_color, &new_rgba_fg_color); gdkRGBAcolor_to_color_t(&colorf->bg_color, &new_rgba_bg_color); |