diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-09-08 00:25:47 +0200 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2010-09-08 18:50:24 +0200 |
| commit | 993400742041418637e1b09b462e311665ce00fb (patch) | |
| tree | 1dbafa241869741844e5d98a1e3be563430521fe /gtk/gtkprivate.h | |
| parent | 4e6a665e613fc7c65874bc5a121c7b87fe65b3e2 (diff) | |
| download | gtk+-993400742041418637e1b09b462e311665ce00fb.tar.gz | |
Completely removed requisition cache from GtkWidget instance structure.
Since we have a new mechanism for requesting sizes: GtkSizeRequestIface;
it makes no sense to maintain this cache on the GtkWidget structure...
removing the requisition cache however does not break the old "size-request"
signal which is there for backwards compatability reasons.
In any case widget->requisition should not have been accessed,
gtk_widget_get_child_requisition() would have been the correct way
to consult the cache.
This commit also deprecates the newly added gtk_widget_get_requisition()
API and makes it fallback on gtk_size_request_get_size().
Diffstat (limited to 'gtk/gtkprivate.h')
| -rw-r--r-- | gtk/gtkprivate.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h index 8db5c48518..e4505420fc 100644 --- a/gtk/gtkprivate.h +++ b/gtk/gtkprivate.h @@ -47,9 +47,8 @@ typedef enum PRIVATE_GTK_CHILD_VISIBLE = 1 << 10, /* If widget should be mapped when parent is mapped */ PRIVATE_GTK_REDRAW_ON_ALLOC = 1 << 11, /* If we should queue a draw on the entire widget when it is reallocated */ PRIVATE_GTK_ALLOC_NEEDED = 1 << 12, /* If we we should allocate even if the allocation is the same */ - PRIVATE_GTK_REQUEST_NEEDED = 1 << 13, /* Whether we need to call gtk_widget_size_request */ - PRIVATE_GTK_WIDTH_REQUEST_NEEDED = 1 << 14, /* Whether we need to call gtk_extended_layout_get_desired_width */ - PRIVATE_GTK_HEIGHT_REQUEST_NEEDED = 1 << 15 /* Whether we need to call gtk_extended_layout_get_desired_height */ + PRIVATE_GTK_WIDTH_REQUEST_NEEDED = 1 << 13, /* Whether we need to call gtk_extended_layout_get_desired_width */ + PRIVATE_GTK_HEIGHT_REQUEST_NEEDED = 1 << 14 /* Whether we need to call gtk_extended_layout_get_desired_height */ } GtkPrivateFlags; /* Macros for extracting a widgets private_flags from GtkWidget. @@ -67,7 +66,6 @@ typedef enum #define GTK_WIDGET_CHILD_VISIBLE(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_CHILD_VISIBLE) != 0) #define GTK_WIDGET_REDRAW_ON_ALLOC(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_REDRAW_ON_ALLOC) != 0) #define GTK_WIDGET_ALLOC_NEEDED(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_ALLOC_NEEDED) != 0) -#define GTK_WIDGET_REQUEST_NEEDED(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_REQUEST_NEEDED) != 0) #define GTK_WIDGET_WIDTH_REQUEST_NEEDED(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_WIDTH_REQUEST_NEEDED) != 0) #define GTK_WIDGET_HEIGHT_REQUEST_NEEDED(obj) ((GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_HEIGHT_REQUEST_NEEDED) != 0) |