From e48a30b284f42bf5183332e4f5ce48ec813bfe3d Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Thu, 30 Aug 2012 13:17:40 +0200 Subject: [PATCH] Fix few warnings when building with GTK+ >= 3.0.0, mostly unused vars. --- src/ui_misc.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ui_misc.c b/src/ui_misc.c index 2aef4115..45a087e0 100644 --- a/src/ui_misc.c +++ b/src/ui_misc.c @@ -1324,12 +1324,24 @@ static gboolean sizer_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpoin static gboolean sizer_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data) { +#if GTK_CHECK_VERSION(3,0,0) + GtkAllocation allocation; + + gtk_widget_get_allocation(widget, &allocation); + + cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget)); + + gtk_render_handle (gtk_widget_get_style_context (widget), + cr, allocation.x, allocation.y, allocation.width, allocation.height); + cairo_destroy(cr); +#else SizerData *sd = data; GdkRectangle clip; GtkOrientation orientation; GtkStateType state; GtkAllocation allocation; + gtk_widget_get_allocation(widget, &allocation); if (sd->position & SIZER_POS_LEFT || sd->position & SIZER_POS_RIGHT) { @@ -1349,14 +1361,6 @@ static gboolean sizer_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpoint state = gtk_widget_get_state(widget); } - gtk_widget_get_allocation(widget, &allocation); -#if GTK_CHECK_VERSION(3,0,0) - cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget)); - - gtk_render_handle (gtk_widget_get_style_context (widget), - cr, allocation.x, allocation.y, allocation.width, allocation.height); - cairo_destroy(cr); -#else gdk_region_get_clipbox(event->region, &clip); gtk_paint_handle(gtk_widget_get_style(widget), gtk_widget_get_window(widget), state, -- 2.20.1