From 278957a5a40cbb27750000f709cb8b53d2aa9885 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Tue, 7 Sep 2010 16:21:44 +0900 Subject: [PATCH] Removed x/y/x_set/y_set from GtkWidgetAuxInfo These members of GtkWidgetAuxData can no longer be set after the removal of deprecated gtk_widget_set_uposition(), now removed these members completely and removed the access to them from gtk_widget_size_allocate(). --- gtk/gtkwidget.c | 10 ---------- gtk/gtkwidget.h | 5 ----- 2 files changed, 15 deletions(-) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index e2b6e343c1..6f34ec1b39 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3896,7 +3896,6 @@ void gtk_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { - GtkWidgetAuxInfo *aux_info; GdkRectangle real_allocation; GdkRectangle old_allocation; gboolean alloc_needed; @@ -3933,15 +3932,6 @@ gtk_widget_size_allocate (GtkWidget *widget, old_allocation = widget->allocation; real_allocation = *allocation; - aux_info =_gtk_widget_get_aux_info (widget, FALSE); - - if (aux_info) - { - if (aux_info->x_set) - real_allocation.x = aux_info->x; - if (aux_info->y_set) - real_allocation.y = aux_info->y; - } if (real_allocation.width < 0 || real_allocation.height < 0) { diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index e5f722050e..4b35ca3b2d 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -540,13 +540,8 @@ struct _GtkWidgetClass struct _GtkWidgetAuxInfo { - gint x; - gint y; gint width; gint height; - - guint x_set : 1; - guint y_set : 1; }; struct _GtkWidgetShapeInfo