diff options
| author | Patrice Fournier <patrice.fournier@ifax.com> | 2014-07-16 13:50:11 -0400 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2014-07-22 11:04:07 +0000 |
| commit | faf3261c3ae31f0c603657b5092eb6707c988dd8 (patch) | |
| tree | 46a02f11cfe28b95ef5fd7c6f023f07e8b13e7fc /ui/gtk/rtp_player.c | |
| parent | 7dcb1d7e86cc50fde1d1e2a3ff2a6603f95dd978 (diff) | |
| download | wireshark-faf3261c3ae31f0c603657b5092eb6707c988dd8.tar.gz | |
Makes the RTP Player graphs work with GTK3
Change-Id: I91c689eb3a35f02f8fa4de64fb6e3337d42c9190
Partial-bug: 9891
Reviewed-on: https://code.wireshark.org/review/3090
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'ui/gtk/rtp_player.c')
| -rw-r--r-- | ui/gtk/rtp_player.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c index eb1ee84be9..1b062c62d1 100644 --- a/ui/gtk/rtp_player.c +++ b/ui/gtk/rtp_player.c @@ -1563,6 +1563,20 @@ static void channel_draw(rtp_channel_info_t* rci) } /****************************************************************************/ +#if GTK_CHECK_VERSION(3,0,0) +static gboolean draw_channels(GtkWidget *widget, cairo_t *cr, gpointer user_data) +{ + rtp_channel_info_t *rci = (rtp_channel_info_t *)user_data; + GtkAllocation allocation; + + gtk_widget_get_allocation (widget, &allocation); + cairo_set_source_surface (cr, rci->surface, 0, 0); + cairo_rectangle (cr, 0, 0, allocation.width, allocation.width); + cairo_fill (cr); + + return FALSE; +} +#else static gboolean expose_event_channels(GtkWidget *widget, GdkEventExpose *event, gpointer user_data) { rtp_channel_info_t *rci = (rtp_channel_info_t *)user_data; @@ -1583,6 +1597,7 @@ static gboolean expose_event_channels(GtkWidget *widget, GdkEventExpose *event, return FALSE; } +#endif /****************************************************************************/ static gboolean @@ -1780,7 +1795,11 @@ add_channel_to_window(gchar *key _U_ , rtp_channel_info_t *rci, guint *counter _ gtk_box_pack_start(GTK_BOX (channels_vb), rci->scroll_window, FALSE, FALSE, 0); /* signals needed to handle backing pixmap */ +#if GTK_CHECK_VERSION(3,0,0) + g_signal_connect(rci->draw_area, "draw", G_CALLBACK(draw_channels), rci); +#else g_signal_connect(rci->draw_area, "expose_event", G_CALLBACK(expose_event_channels), rci); +#endif g_signal_connect(rci->draw_area, "configure_event", G_CALLBACK(configure_event_channels), rci); gtk_widget_add_events (rci->draw_area, GDK_BUTTON_PRESS_MASK); g_signal_connect(rci->draw_area, "button_press_event", G_CALLBACK(button_press_event_channel), rci); |