diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-08-25 08:05:40 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-08-25 08:05:40 +0000 |
| commit | 78c07f5bc195fd434c964c4b8b07ba5a57a4e4f0 (patch) | |
| tree | c092da8b9f999d8399e1adbe4477bd72b4cc7c2a | |
| parent | 43fad9818f6c0eb3f7fc81a4d3ca3d4a70f9ec88 (diff) | |
| download | wireshark-78c07f5bc195fd434c964c4b8b07ba5a57a4e4f0.tar.gz | |
GTK3 make the tcp_graph work.
svn path=/trunk/; revision=38730
| -rw-r--r-- | gtk/tcp_graph.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index db848dfbc6..e88d9ebced 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -471,7 +471,9 @@ static void magnify_destroy (struct graph * ); static void magnify_draw (struct graph * ); static void magnify_get_geom (struct graph * , int , int ); static gboolean configure_event (GtkWidget * , GdkEventConfigure * , gpointer ); -#if !GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(3,0,0) +static gboolean draw_event(GtkWidget *widget, cairo_t *cr, gpointer user_data); +#endif static gboolean expose_event (GtkWidget * , GdkEventExpose * , gpointer ); #endif static gboolean button_press_event (GtkWidget * , GdkEventButton * , gpointer ); @@ -3140,12 +3142,7 @@ draw_event(GtkWidget *widget _U_, cairo_t *cr, gpointer user_data) cairo_rectangle (cr, g->wp.x + g->wp.width, g->wp.y, RMARGIN_WIDTH, g->wp.height); cairo_fill (cr); - cairo_destroy(cr); - cr = NULL; - - /* Should these routines be copied here, or be given the cairo_t ?? - * In that case cr shouldn't be destroyed abowe - */ + /* Should these routines be copied here, or be given the cairo_t ?? */ graph_pixmap_display (g); graph_title_pixmap_display (g); axis_pixmap_display (g->x_axis); |