AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-11 19:30:10 +00:00
Code Issues Projects Releases Wiki Activity

gtkcontainer: Move public members to private structure

Browse Source
This commit is contained in:
Javier Jardón 2010-06-03 04:11:46 +02:00
parent 63f8313015
commit 2de1f3f88c
2 changed files with 100 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
gtk/gtkcontainer.c
View File

@ -41,6 +41,17 @@
#include <gobject/gobjectnotifyqueue.c> #include <gobject/gobjectnotifyqueue.c>
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>
struct _GtkContainerPriv
{
GtkWidget *focus_child;
guint border_width : 16;
guint has_focus_chain : 1;
guint need_resize : 1;
guint reallocate_redraws : 1;
guint resize_mode : 2;
};
enum { enum {
ADD, ADD,
@ -290,6 +301,8 @@ gtk_container_class_init (GtkContainerClass *class)
_gtk_marshal_VOID__OBJECT, _gtk_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
GTK_TYPE_WIDGET); GTK_TYPE_WIDGET);
g_type_class_add_private (class, sizeof (GtkContainerPriv));
} }
static void static void
@ -1041,17 +1054,25 @@ gtk_container_remove_unimplemented (GtkContainer *container,
static void static void
gtk_container_init (GtkContainer *container) gtk_container_init (GtkContainer *container)
{ {
container->focus_child = NULL; GtkContainerPriv *priv;
container->border_width = 0;
container->need_resize = FALSE; container->priv = G_TYPE_INSTANCE_GET_PRIVATE (container,
container->resize_mode = GTK_RESIZE_PARENT; GTK_TYPE_CONTAINER,
container->reallocate_redraws = FALSE; GtkContainerPriv);
priv = container->priv;
priv->focus_child = NULL;
priv->border_width = 0;
priv->need_resize = FALSE;
priv->resize_mode = GTK_RESIZE_PARENT;
priv->reallocate_redraws = FALSE;
} }
static void static void
gtk_container_destroy (GtkObject *object) gtk_container_destroy (GtkObject *object)
{ {
GtkContainer *container = GTK_CONTAINER (object); GtkContainer *container = GTK_CONTAINER (object);
GtkContainerPriv *priv = container->priv;
if (GTK_CONTAINER_RESIZE_PENDING (container)) if (GTK_CONTAINER_RESIZE_PENDING (container))
_gtk_container_dequeue_resize_handler (container); _gtk_container_dequeue_resize_handler (container);
@ -1059,7 +1080,7 @@ gtk_container_destroy (GtkObject *object)
/* do this before walking child widgets, to avoid /* do this before walking child widgets, to avoid
* removing children from focus chain one by one. * removing children from focus chain one by one.
*/ */
if (container->has_focus_chain) if (priv->has_focus_chain)
gtk_container_unset_focus_chain (container); gtk_container_unset_focus_chain (container);
gtk_container_foreach (container, (GtkCallback) gtk_widget_destroy, NULL); gtk_container_foreach (container, (GtkCallback) gtk_widget_destroy, NULL);
@ -1099,14 +1120,15 @@ gtk_container_get_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkContainer *container = GTK_CONTAINER (object); GtkContainer *container = GTK_CONTAINER (object);
GtkContainerPriv *priv = container->priv;
switch (prop_id) switch (prop_id)
{ {
case PROP_BORDER_WIDTH: case PROP_BORDER_WIDTH:
g_value_set_uint (value, container->border_width); g_value_set_uint (value, priv->border_width);
break; break;
case PROP_RESIZE_MODE: case PROP_RESIZE_MODE:
g_value_set_enum (value, container->resize_mode); g_value_set_enum (value, priv->resize_mode);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -1135,11 +1157,15 @@ void
gtk_container_set_border_width (GtkContainer *container, gtk_container_set_border_width (GtkContainer *container,
guint border_width) guint border_width)
{ {
GtkContainerPriv *priv;
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
if (container->border_width != border_width) priv = container->priv;
if (priv->border_width != border_width)
{ {
container->border_width = border_width; priv->border_width = border_width;
g_object_notify (G_OBJECT (container), "border-width"); g_object_notify (G_OBJECT (container), "border-width");
if (gtk_widget_get_realized (GTK_WIDGET (container))) if (gtk_widget_get_realized (GTK_WIDGET (container)))
@ -1161,7 +1187,7 @@ gtk_container_get_border_width (GtkContainer *container)
{ {
g_return_val_if_fail (GTK_IS_CONTAINER (container), 0); g_return_val_if_fail (GTK_IS_CONTAINER (container), 0);
return container->border_width; return container->priv->border_width;
} }
/** /**
@ -1257,18 +1283,22 @@ void
gtk_container_set_resize_mode (GtkContainer *container, gtk_container_set_resize_mode (GtkContainer *container,
GtkResizeMode resize_mode) GtkResizeMode resize_mode)
{ {
GtkContainerPriv *priv;
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (resize_mode <= GTK_RESIZE_IMMEDIATE); g_return_if_fail (resize_mode <= GTK_RESIZE_IMMEDIATE);
priv = container->priv;
if (gtk_widget_is_toplevel (GTK_WIDGET (container)) && if (gtk_widget_is_toplevel (GTK_WIDGET (container)) &&
resize_mode == GTK_RESIZE_PARENT) resize_mode == GTK_RESIZE_PARENT)
{ {
resize_mode = GTK_RESIZE_QUEUE; resize_mode = GTK_RESIZE_QUEUE;
} }
if (container->resize_mode != resize_mode) if (priv->resize_mode != resize_mode)
{ {
container->resize_mode = resize_mode; priv->resize_mode = resize_mode;
gtk_widget_queue_resize (GTK_WIDGET (container)); gtk_widget_queue_resize (GTK_WIDGET (container));
g_object_notify (G_OBJECT (container), "resize-mode"); g_object_notify (G_OBJECT (container), "resize-mode");
@ -1289,7 +1319,7 @@ gtk_container_get_resize_mode (GtkContainer *container)
{ {
g_return_val_if_fail (GTK_IS_CONTAINER (container), GTK_RESIZE_PARENT); g_return_val_if_fail (GTK_IS_CONTAINER (container), GTK_RESIZE_PARENT);
return container->resize_mode; return container->priv->resize_mode;
} }
/** /**
@ -1308,7 +1338,7 @@ gtk_container_set_reallocate_redraws (GtkContainer *container,
{ {
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
container->reallocate_redraws = needs_redraws ? TRUE : FALSE; container->priv->reallocate_redraws = needs_redraws ? TRUE : FALSE;
} }
static GtkContainer* static GtkContainer*
@ -1357,12 +1387,15 @@ gtk_container_idle_sizer (gpointer data)
void void
_gtk_container_queue_resize (GtkContainer *container) _gtk_container_queue_resize (GtkContainer *container)
{ {
GtkContainerPriv *priv;
GtkContainer *resize_container; GtkContainer *resize_container;
GtkWidget *widget; GtkWidget *widget;
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
priv = container->priv;
widget = GTK_WIDGET (container); widget = GTK_WIDGET (container);
resize_container = gtk_container_get_resize_container (container); resize_container = gtk_container_get_resize_container (container);
while (TRUE) while (TRUE)
@ -1385,7 +1418,7 @@ _gtk_container_queue_resize (GtkContainer *container)
(gtk_widget_is_toplevel (GTK_WIDGET (resize_container)) || (gtk_widget_is_toplevel (GTK_WIDGET (resize_container)) ||
gtk_widget_get_realized (GTK_WIDGET (resize_container)))) gtk_widget_get_realized (GTK_WIDGET (resize_container))))
{ {
switch (resize_container->resize_mode) switch (resize_container->priv->resize_mode)
{ {
case GTK_RESIZE_QUEUE: case GTK_RESIZE_QUEUE:
if (!GTK_CONTAINER_RESIZE_PENDING (resize_container)) if (!GTK_CONTAINER_RESIZE_PENDING (resize_container))
@ -1414,7 +1447,7 @@ _gtk_container_queue_resize (GtkContainer *container)
* changed while they where hidden (currently only evaluated by * changed while they where hidden (currently only evaluated by
* toplevels). * toplevels).
*/ */
resize_container->need_resize = TRUE; resize_container->priv->need_resize = TRUE;
} }
} }
} }
@ -1567,7 +1600,7 @@ gtk_container_get_focus_child (GtkContainer *container)
{ {
g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL); g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
return container->focus_child; return container->priv->focus_child;
} }
/** /**
@ -1673,22 +1706,26 @@ static void
gtk_container_real_set_focus_child (GtkContainer *container, gtk_container_real_set_focus_child (GtkContainer *container,
GtkWidget *child) GtkWidget *child)
{ {
GtkContainerPriv *priv;
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (child == NULL || GTK_IS_WIDGET (child)); g_return_if_fail (child == NULL || GTK_IS_WIDGET (child));
if (child != container->focus_child) priv = container->priv;
if (child != priv->focus_child)
{ {
if (container->focus_child) if (priv->focus_child)
g_object_unref (container->focus_child); g_object_unref (priv->focus_child);
container->focus_child = child; priv->focus_child = child;
if (container->focus_child) if (priv->focus_child)
g_object_ref (container->focus_child); g_object_ref (priv->focus_child);
} }
/* check for h/v adjustments /* check for h/v adjustments
*/ */
if (container->focus_child) if (priv->focus_child)
{ {
GtkAdjustment *hadj; GtkAdjustment *hadj;
GtkAdjustment *vadj; GtkAdjustment *vadj;
@ -1700,18 +1737,17 @@ gtk_container_real_set_focus_child (GtkContainer *container,
if (hadj || vadj) if (hadj || vadj)
{ {
focus_child = container->focus_child; focus_child = priv->focus_child;
while (GTK_IS_CONTAINER (focus_child) && while (gtk_container_get_focus_child (GTK_CONTAINER (focus_child)))
GTK_CONTAINER (focus_child)->focus_child)
{ {
focus_child = GTK_CONTAINER (focus_child)->focus_child; focus_child = gtk_container_get_focus_child (GTK_CONTAINER (focus_child));
} }
gtk_widget_translate_coordinates (focus_child, container->focus_child, gtk_widget_translate_coordinates (focus_child, priv->focus_child,
0, 0, &x, &y); 0, 0, &x, &y);
x += container->focus_child->allocation.x; x += priv->focus_child->allocation.x;
y += container->focus_child->allocation.y; y += priv->focus_child->allocation.y;
if (vadj) if (vadj)
gtk_adjustment_clamp_page (vadj, y, y + focus_child->allocation.height); gtk_adjustment_clamp_page (vadj, y, y + focus_child->allocation.height);
@ -1750,10 +1786,12 @@ gtk_container_focus (GtkWidget *widget,
GList *sorted_children; GList *sorted_children;
gint return_val; gint return_val;
GtkContainer *container; GtkContainer *container;
GtkContainerPriv *priv;
g_return_val_if_fail (GTK_IS_CONTAINER (widget), FALSE); g_return_val_if_fail (GTK_IS_CONTAINER (widget), FALSE);
container = GTK_CONTAINER (widget); container = GTK_CONTAINER (widget);
priv = container->priv;
return_val = FALSE; return_val = FALSE;
@ -1770,12 +1808,12 @@ gtk_container_focus (GtkWidget *widget,
/* Get a list of the containers children, allowing focus /* Get a list of the containers children, allowing focus
* chain to override. * chain to override.
*/ */
if (container->has_focus_chain) if (priv->has_focus_chain)
children = g_list_copy (get_focus_chain (container)); children = g_list_copy (get_focus_chain (container));
else else
children = gtk_container_get_all_children (container); children = gtk_container_get_all_children (container);
if (container->has_focus_chain && if (priv->has_focus_chain &&
(direction == GTK_DIR_TAB_FORWARD || (direction == GTK_DIR_TAB_FORWARD ||
direction == GTK_DIR_TAB_BACKWARD)) direction == GTK_DIR_TAB_BACKWARD))
{ {
@ -1871,7 +1909,8 @@ find_old_focus (GtkContainer *container,
while (widget && widget != (GtkWidget *)container) while (widget && widget != (GtkWidget *)container)
{ {
GtkWidget *parent = widget->parent; GtkWidget *parent = widget->parent;
if (parent && ((GtkContainer *)parent)->focus_child != widget)
if (parent && (gtk_container_get_focus_child (GTK_CONTAINER (parent)) != widget))
goto next; goto next;
widget = parent; widget = parent;
@ -2224,10 +2263,11 @@ gtk_container_focus_move (GtkContainer *container,
GList *children, GList *children,
GtkDirectionType direction) GtkDirectionType direction)
{ {
GtkContainerPriv *priv = container->priv;
GtkWidget *focus_child; GtkWidget *focus_child;
GtkWidget *child; GtkWidget *child;
focus_child = container->focus_child; focus_child = priv->focus_child;
while (children) while (children)
{ {
@ -2311,13 +2351,16 @@ gtk_container_set_focus_chain (GtkContainer *container,
{ {
GList *chain; GList *chain;
GList *tmp_list; GList *tmp_list;
GtkContainerPriv *priv;
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
if (container->has_focus_chain) priv = container->priv;
if (priv->has_focus_chain)
gtk_container_unset_focus_chain (container); gtk_container_unset_focus_chain (container);
container->has_focus_chain = TRUE; priv->has_focus_chain = TRUE;
chain = NULL; chain = NULL;
tmp_list = focusable_widgets; tmp_list = focusable_widgets;
@ -2372,17 +2415,21 @@ gboolean
gtk_container_get_focus_chain (GtkContainer *container, gtk_container_get_focus_chain (GtkContainer *container,
GList **focus_chain) GList **focus_chain)
{ {
GtkContainerPriv *priv;
g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE); g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
priv = container->priv;
if (focus_chain) if (focus_chain)
{ {
if (container->has_focus_chain) if (priv->has_focus_chain)
*focus_chain = g_list_copy (get_focus_chain (container)); *focus_chain = g_list_copy (get_focus_chain (container));
else else
*focus_chain = NULL; *focus_chain = NULL;
} }
return container->has_focus_chain; return priv->has_focus_chain;
} }
/** /**
@ -2394,16 +2441,20 @@ gtk_container_get_focus_chain (GtkContainer *container,
void void
gtk_container_unset_focus_chain (GtkContainer *container) gtk_container_unset_focus_chain (GtkContainer *container)
{ {
GtkContainerPriv *priv;
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
if (container->has_focus_chain) priv = container->priv;
if (priv->has_focus_chain)
{ {
GList *chain; GList *chain;
GList *tmp_list; GList *tmp_list;
chain = get_focus_chain (container); chain = get_focus_chain (container);
container->has_focus_chain = FALSE; priv->has_focus_chain = FALSE;
g_object_set_data (G_OBJECT (container), g_object_set_data (G_OBJECT (container),
I_("gtk-container-focus-chain"), I_("gtk-container-focus-chain"),

16
gtk/gtkcontainer.h
View File

@ -45,25 +45,17 @@ G_BEGIN_DECLS
#define GTK_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CONTAINER)) #define GTK_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CONTAINER))
#define GTK_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass)) #define GTK_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass))
#define GTK_IS_RESIZE_CONTAINER(widget) (GTK_IS_CONTAINER (widget) && ((GtkContainer*) (widget))->resize_mode != GTK_RESIZE_PARENT)
typedef struct _GtkContainer GtkContainer; typedef struct _GtkContainer GtkContainer;
typedef struct _GtkContainerPriv GtkContainerPriv;
typedef struct _GtkContainerClass GtkContainerClass; typedef struct _GtkContainerClass GtkContainerClass;
struct _GtkContainer struct _GtkContainer
{ {
GtkWidget widget; GtkWidget widget;
GtkWidget *GSEAL (focus_child);
guint GSEAL (border_width) : 16;
/*< private >*/ /*< private >*/
guint GSEAL (need_resize) : 1; GtkContainerPriv *priv;
guint GSEAL (resize_mode) : 2;
guint GSEAL (reallocate_redraws) : 1;
guint GSEAL (has_focus_chain) : 1;
}; };
struct _GtkContainerClass struct _GtkContainerClass
@ -102,6 +94,7 @@ struct _GtkContainerClass
void (*_gtk_reserved4) (void); void (*_gtk_reserved4) (void);
}; };
/* Application-level methods */ /* Application-level methods */
GType gtk_container_get_type (void) G_GNUC_CONST; GType gtk_container_get_type (void) G_GNUC_CONST;
@ -134,6 +127,9 @@ gboolean gtk_container_get_focus_chain (GtkContainer *container,
GList **focusable_widgets); GList **focusable_widgets);
void gtk_container_unset_focus_chain (GtkContainer *container); void gtk_container_unset_focus_chain (GtkContainer *container);
#define GTK_IS_RESIZE_CONTAINER(widget) (GTK_IS_CONTAINER (widget) && \
(gtk_container_get_resize_mode (GTK_CONTAINER (widget)) != GTK_RESIZE_PARENT))
/* Widget-level methods */ /* Widget-level methods */
void gtk_container_set_reallocate_redraws (GtkContainer *container, void gtk_container_set_reallocate_redraws (GtkContainer *container,