diff options
author | Benjamin Otte <otte@redhat.com> | 2015-09-12 21:27:10 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2015-09-12 21:27:24 +0200 |
commit | 51a1bc21af92d866a96c15b538d34708f8c91045 (patch) | |
tree | 2d1794d72856382a4c850550ce06b43bd0650dbf /gtk/gtkcontainerprivate.h | |
parent | 286e8eec3a8ab18329a4bf68ccdead08a2c5ef56 (diff) | |
download | gtk+-51a1bc21af92d866a96c15b538d34708f8c91045.tar.gz |
Revert "Avoid type checking overhead for resize-mode"
This reverts commit 3eacfa88f2d9c690a006de9cac1cd3c60901686c.
Apart from the patch not being correct, we don't want to expose private
structures in header files if we can avoid it.
And this type-checking overhead is not an optimization that is even
measurable.
https://bugzilla.gnome.org/show_bug.cgi?id=754932
Diffstat (limited to 'gtk/gtkcontainerprivate.h')
-rw-r--r-- | gtk/gtkcontainerprivate.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/gtk/gtkcontainerprivate.h b/gtk/gtkcontainerprivate.h index fa524815ae..ec817202a9 100644 --- a/gtk/gtkcontainerprivate.h +++ b/gtk/gtkcontainerprivate.h @@ -24,24 +24,6 @@ G_BEGIN_DECLS -struct _GtkContainerPrivate -{ - GtkWidget *focus_child; - - GdkFrameClock *resize_clock; - guint resize_handler; - - guint border_width : 16; - guint border_width_set : 1; - - guint has_focus_chain : 1; - guint reallocate_redraws : 1; - guint resize_pending : 1; - guint restyle_pending : 1; - guint resize_mode : 2; - guint request_mode : 2; -}; - void _gtk_container_queue_resize (GtkContainer *container); void _gtk_container_queue_restyle (GtkContainer *container); @@ -62,16 +44,6 @@ gboolean _gtk_container_get_border_width_set (GtkContainer *container); void _gtk_container_set_border_width_set (GtkContainer *container, gboolean border_width_set); -static inline GtkResizeMode _gtk_container_get_resize_mode (GtkContainer *container); - -static inline GtkResizeMode -_gtk_container_get_resize_mode (GtkContainer *container) -{ - return container->priv->resize_mode; -} - -#define _GTK_IS_RESIZE_CONTAINER(container) (_gtk_container_get_resize_mode (GTK_CONTAINER (container)) != GTK_RESIZE_PARENT) - G_END_DECLS #endif /* __GTK_CONTAINER_PRIVATE_H__ */ |