diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-01-06 16:58:21 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-01-06 16:58:21 +0000 |
| commit | 69c0967fc743372d8dc4a0ab6d76d85df53b8169 (patch) | |
| tree | 25741a6ca648f3f2fcced7888c6cef326d9dccc4 /ui/gtk/rtp_analysis.c | |
| parent | 6740bef97e9526e52deb0b67c42fa5039c8e0782 (diff) | |
| download | wireshark-69c0967fc743372d8dc4a0ab6d76d85df53b8169.tar.gz | |
Use gdk_cairo_set_source_rgba
svn path=/trunk/; revision=46976
Diffstat (limited to 'ui/gtk/rtp_analysis.c')
| -rw-r--r-- | ui/gtk/rtp_analysis.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index dfbc738129..a4a17f03bc 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -155,9 +155,7 @@ typedef struct _dialog_graph_graph_t { gboolean display; GtkWidget *display_button; int hf_index; -#if GTK_CHECK_VERSION(3,0,0) GdkRGBA rgba_color; -#endif GdkColor color; gchar title[100]; } dialog_graph_graph_t; @@ -1400,7 +1398,7 @@ dialog_graph_draw(user_data_t* user_data) #else cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap); #endif - gdk_cairo_set_source_color (cr, &user_data->dlg.dialog_graph.graph[i].color); + gdk_cairo_set_source_rgba (cr, &user_data->dlg.dialog_graph.graph[i].rgba_color); cairo_set_line_width (cr, 1.0); cairo_move_to(cr, x_pos+0.5, draw_height-1+top_y_border+0.5); cairo_line_to(cr, x_pos+0.5, y_pos+0.5); @@ -1666,11 +1664,10 @@ create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *vbox, int num) #if GTK_CHECK_VERSION(3,0,0) gtk_widget_override_color(label, 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, GTK_STATE_FLAG_ACTIVE, &dgg->rgba_color); + gtk_widget_override_color(label, GTK_STATE_FLAG_PRELIGHT, &dgg->rgba_color); + gtk_widget_override_color(label, GTK_STATE_FLAG_SELECTED, &dgg->rgba_color); + gtk_widget_override_color(label, GTK_STATE_FLAG_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); @@ -3729,7 +3726,6 @@ rtp_analysis(address *src_fwd, {0, 0x6666, 0xcccc, 0xdddd}, /* Light bluish cyan */ {0, 0x0000, 0x0000, 0xffff} /* Blue */ }; -#if GTK_CHECK_VERSION(3,0,0) static GdkRGBA rgba_col[MAX_GRAPHS] = { {0.0, 0.0, 0.0, 1.0}, /* Black */ {1.0, 0.0, 0.1, 1.0}, /* Red */ @@ -3738,7 +3734,6 @@ rtp_analysis(address *src_fwd, {0.400, 0.800, 0.867, 1.0}, /* Light bluish cyan */ {0.0, 0.0, 1.0, 1.0}, /* Blue */ }; -#endif char *tempname; @@ -3810,12 +3805,10 @@ rtp_analysis(address *src_fwd, user_data->dlg.dialog_graph.graph[i].color.red = col[i].red; user_data->dlg.dialog_graph.graph[i].color.green = col[i].green; user_data->dlg.dialog_graph.graph[i].color.blue = col[i].blue; -#if GTK_CHECK_VERSION(3,0,0) user_data->dlg.dialog_graph.graph[i].rgba_color.red = rgba_col[i].red; user_data->dlg.dialog_graph.graph[i].rgba_color.green = rgba_col[i].green; user_data->dlg.dialog_graph.graph[i].rgba_color.blue = rgba_col[i].blue; user_data->dlg.dialog_graph.graph[i].rgba_color.alpha = rgba_col[i].alpha; -#endif user_data->dlg.dialog_graph.graph[i].display = TRUE; user_data->dlg.dialog_graph.graph[i].display_button = NULL; user_data->dlg.dialog_graph.graph[i].ud = user_data; |