AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Removed x/y/x_set/y_set from GtkWidgetAuxInfo

Browse Source 
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().
This commit is contained in:
Tristan Van Berkom 2010-09-07 16:21:44 +09:00
parent d5278b5994
commit 278957a5a4
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkwidget.c
View File

@ -3896,7 +3896,6 @@ void
gtk_widget_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
{ {
GtkWidgetAuxInfo *aux_info;
GdkRectangle real_allocation; GdkRectangle real_allocation;
GdkRectangle old_allocation; GdkRectangle old_allocation;
gboolean alloc_needed; gboolean alloc_needed;
@ -3933,15 +3932,6 @@ gtk_widget_size_allocate (GtkWidget *widget,
old_allocation = widget->allocation; old_allocation = widget->allocation;
real_allocation = *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) if (real_allocation.width < 0 || real_allocation.height < 0)
{ {

5
gtk/gtkwidget.h
View File

@ -540,13 +540,8 @@ struct _GtkWidgetClass
struct _GtkWidgetAuxInfo struct _GtkWidgetAuxInfo
{ {
gint x;
gint y;
gint width; gint width;
gint height; gint height;
guint x_set : 1;
guint y_set : 1;
}; };
struct _GtkWidgetShapeInfo struct _GtkWidgetShapeInfo