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/iax2_analysis.c | |
| parent | aee73d6d9e101927150b1ca3a16d404b50196366 (diff) | |
Follow up on bug 8416.
Remove C++ incompatibilities in GTK+ 3 code.
svn path=/trunk/; revision=48606
Diffstat (limited to 'ui/gtk/iax2_analysis.c')
| -rw-r--r-- | ui/gtk/iax2_analysis.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 751c58b53f..f721d4b5dd 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -1453,7 +1453,7 @@ draw_area_destroy_cb(GtkWidget *widget _U_, gpointer data) static gboolean draw_area_draw(GtkWidget *widget, cairo_t *cr, gpointer data) { - user_data_t *user_data = data; + user_data_t *user_data = (user_data_t *)data; GtkAllocation allocation; gtk_widget_get_allocation (widget, &allocation); @@ -1637,12 +1637,12 @@ create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num) gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_override_color(label, GTK_STATE_FLAG_NORMAL, &dgg->rgba_color); + gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_FLAG_NORMAL, &dgg->rgba_color); /* XXX gtk_widget_override_color() takes flags not state */ - gtk_widget_override_color(label, GTK_STATE_ACTIVE, &dgg->rgba_color); - gtk_widget_override_color(label, GTK_STATE_PRELIGHT, &dgg->rgba_color); - gtk_widget_override_color(label, GTK_STATE_SELECTED, &dgg->rgba_color); - gtk_widget_override_color(label, GTK_STATE_INSENSITIVE, &dgg->rgba_color); + gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_ACTIVE, &dgg->rgba_color); + gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_PRELIGHT, &dgg->rgba_color); + gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_SELECTED, &dgg->rgba_color); + gtk_widget_override_color(label, (GtkStateFlags)GTK_STATE_INSENSITIVE, &dgg->rgba_color); #else gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &dgg->color); gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &dgg->color); |