From 68845aa77991c16c5b68cd7959b3def7892c9791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Tue, 26 Jul 2011 19:01:01 +0000 Subject: Replace access to ...->allocation by gtk_widget_get_allocation + using the return val - part 1 Maybe the call needs to be done more often. Replace GTK_WIDGET_STATE by gtk_widget_get_state svn path=/trunk/; revision=38215 --- gtk/rtp_analysis.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'gtk/rtp_analysis.c') diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 7f82764ed0..2754b4bb67 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -925,6 +925,7 @@ static void dialog_graph_draw(user_data_t* user_data) int label_width_mid, label_height_mid; guint32 draw_width, draw_height; char label_string[15]; + GtkAllocation widget_alloc; cairo_t *cr; /* new variables */ @@ -980,11 +981,12 @@ static void dialog_graph_draw(user_data_t* user_data) */ cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap); cairo_set_source_rgb (cr, 1, 1, 1); - cairo_rectangle (cr, - 0, - 0, - user_data->dlg.dialog_graph.draw_area->allocation.width, - user_data->dlg.dialog_graph.draw_area->allocation.height); + gtk_widget_get_allocation(user_data->dlg.dialog_graph.draw_area, &widget_alloc); + cairo_rectangle (cr, + 0, + 0, + widget_alloc.width, + widget_alloc.height); cairo_fill (cr); cairo_destroy (cr); @@ -1353,6 +1355,7 @@ static gint configure_event(GtkWidget *widget, GdkEventConfigure *event _U_) { user_data_t *user_data; GtkWidget *bt_save; + GtkAllocation widget_alloc; cairo_t *cr; user_data=(user_data_t *)g_object_get_data(G_OBJECT(widget), "user_data_t"); @@ -1366,19 +1369,20 @@ static gint configure_event(GtkWidget *widget, GdkEventConfigure *event _U_) user_data->dlg.dialog_graph.pixmap=NULL; } + gtk_widget_get_allocation(widget, &widget_alloc); user_data->dlg.dialog_graph.pixmap=gdk_pixmap_new(gtk_widget_get_window(widget), - widget->allocation.width, - widget->allocation.height, + widget_alloc.width, + widget_alloc.height, -1); - user_data->dlg.dialog_graph.pixmap_width=widget->allocation.width; - user_data->dlg.dialog_graph.pixmap_height=widget->allocation.height; + user_data->dlg.dialog_graph.pixmap_width=widget_alloc.width; + user_data->dlg.dialog_graph.pixmap_height=widget_alloc.height; bt_save = g_object_get_data(G_OBJECT(user_data->dlg.dialog_graph.window), "bt_save"); g_object_set_data(G_OBJECT(bt_save), "pixmap", user_data->dlg.dialog_graph.pixmap); gtk_widget_set_sensitive(bt_save, TRUE); cr = gdk_cairo_create (user_data->dlg.dialog_graph.pixmap); - cairo_rectangle (cr, 0, 0, widget->allocation.width, widget->allocation.height); + cairo_rectangle (cr, 0, 0, widget_alloc.width, widget_alloc.height); cairo_set_source_rgb (cr, 1, 1, 1); cairo_fill (cr); cairo_destroy (cr); -- cgit v1.2.3