Commit 1e5d7c02 authored by Javier Jardón's avatar Javier Jardón

Use GtkFooPrivate instead GtkFooPriv

parent c6a44d84
......@@ -35,7 +35,7 @@
* @widget: The GtkWidget whose properties and features are exported via this
* accessible instance
*/
struct _GtkAccessiblePriv
struct _GtkAccessiblePrivate
{
GtkWidget *widget;
};
......@@ -49,7 +49,7 @@ gtk_accessible_init (GtkAccessible *accesible)
{
accesible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accesible,
GTK_TYPE_ACCESSIBLE,
GtkAccessiblePriv);
GtkAccessiblePrivate);
}
static void
......@@ -57,7 +57,7 @@ gtk_accessible_class_init (GtkAccessibleClass *klass)
{
klass->connect_widget_destroyed = gtk_accessible_real_connect_widget_destroyed;
g_type_class_add_private (klass, sizeof (GtkAccessiblePriv));
g_type_class_add_private (klass, sizeof (GtkAccessiblePrivate));
}
/**
......@@ -121,7 +121,7 @@ gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
static void
gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
{
GtkAccessiblePriv *priv = accessible->priv;
GtkAccessiblePrivate *priv = accessible->priv;
if (priv->widget)
{
......
......@@ -37,7 +37,7 @@ G_BEGIN_DECLS
#define GTK_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
typedef struct _GtkAccessible GtkAccessible;
typedef struct _GtkAccessiblePriv GtkAccessiblePriv;
typedef struct _GtkAccessiblePrivate GtkAccessiblePrivate;
typedef struct _GtkAccessibleClass GtkAccessibleClass;
/*
......@@ -48,7 +48,7 @@ struct _GtkAccessible
AtkObject parent;
/*< private >*/
GtkAccessiblePriv *priv;
GtkAccessiblePrivate *priv;
};
struct _GtkAccessibleClass
......
......@@ -50,7 +50,7 @@
#include "gtkintl.h"
struct _GtkAlignmentPriv
struct _GtkAlignmentPrivate
{
gfloat xalign;
gfloat yalign;
......@@ -221,17 +221,17 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0,
GTK_PARAM_READWRITE));
g_type_class_add_private (gobject_class, sizeof (GtkAlignmentPriv));
g_type_class_add_private (gobject_class, sizeof (GtkAlignmentPrivate));
}
static void
gtk_alignment_init (GtkAlignment *alignment)
{
GtkAlignmentPriv *priv;
GtkAlignmentPrivate *priv;
alignment->priv = G_TYPE_INSTANCE_GET_PRIVATE (alignment,
GTK_TYPE_ALIGNMENT,
GtkAlignmentPriv);
GtkAlignmentPrivate);
priv = alignment->priv;
gtk_widget_set_has_window (GTK_WIDGET (alignment), FALSE);
......@@ -274,7 +274,7 @@ gtk_alignment_new (gfloat xalign,
gfloat yscale)
{
GtkAlignment *alignment;
GtkAlignmentPriv *priv;
GtkAlignmentPrivate *priv;
alignment = g_object_new (GTK_TYPE_ALIGNMENT, NULL);
......@@ -295,7 +295,7 @@ gtk_alignment_set_property (GObject *object,
GParamSpec *pspec)
{
GtkAlignment *alignment = GTK_ALIGNMENT (object);
GtkAlignmentPriv *priv = alignment->priv;
GtkAlignmentPrivate *priv = alignment->priv;
switch (prop_id)
{
......@@ -371,7 +371,7 @@ gtk_alignment_get_property (GObject *object,
GParamSpec *pspec)
{
GtkAlignment *alignment = GTK_ALIGNMENT (object);
GtkAlignmentPriv *priv = alignment->priv;
GtkAlignmentPrivate *priv = alignment->priv;
switch (prop_id)
{
......@@ -432,7 +432,7 @@ gtk_alignment_set (GtkAlignment *alignment,
gfloat xscale,
gfloat yscale)
{
GtkAlignmentPriv *priv;
GtkAlignmentPrivate *priv;
GtkWidget *child;
g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
......@@ -485,7 +485,7 @@ gtk_alignment_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkAlignment *alignment = GTK_ALIGNMENT (widget);
GtkAlignmentPriv *priv = alignment->priv;
GtkAlignmentPrivate *priv = alignment->priv;
GtkBin *bin;
GtkAllocation child_allocation;
GtkWidget *bin_child;
......@@ -576,7 +576,7 @@ gtk_alignment_get_size (GtkSizeRequest *widget,
gint *natural_size)
{
GtkAlignment *alignment = GTK_ALIGNMENT (widget);
GtkAlignmentPriv *priv = alignment->priv;
GtkAlignmentPrivate *priv = alignment->priv;
GtkWidget *child;
guint minimum, natural;
......@@ -651,7 +651,7 @@ gtk_alignment_set_padding (GtkAlignment *alignment,
guint padding_left,
guint padding_right)
{
GtkAlignmentPriv *priv;
GtkAlignmentPrivate *priv;
GtkWidget *child;
g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
......@@ -711,7 +711,7 @@ gtk_alignment_get_padding (GtkAlignment *alignment,
guint *padding_left,
guint *padding_right)
{
GtkAlignmentPriv *priv;
GtkAlignmentPrivate *priv;
g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
......
......@@ -45,16 +45,16 @@ G_BEGIN_DECLS
#define GTK_ALIGNMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ALIGNMENT, GtkAlignmentClass))
typedef struct _GtkAlignment GtkAlignment;
typedef struct _GtkAlignmentPriv GtkAlignmentPriv;
typedef struct _GtkAlignmentClass GtkAlignmentClass;
typedef struct _GtkAlignment GtkAlignment;
typedef struct _GtkAlignmentPrivate GtkAlignmentPrivate;
typedef struct _GtkAlignmentClass GtkAlignmentClass;
struct _GtkAlignment
{
GtkBin bin;
/* <private> */
GtkAlignmentPriv *priv;
GtkAlignmentPrivate *priv;
};
struct _GtkAlignmentClass
......
......@@ -52,7 +52,7 @@
#define MIN_ARROW_SIZE 15
struct _GtkArrowPriv
struct _GtkArrowPrivate
{
gint16 arrow_type;
gint16 shadow_type;
......@@ -119,7 +119,7 @@ gtk_arrow_class_init (GtkArrowClass *class)
0.0, 1.0, 0.7,
GTK_PARAM_READABLE));
g_type_class_add_private (class, sizeof (GtkArrowPriv));
g_type_class_add_private (class, sizeof (GtkArrowPrivate));
}
static void
......@@ -129,7 +129,7 @@ gtk_arrow_set_property (GObject *object,
GParamSpec *pspec)
{
GtkArrow *arrow = GTK_ARROW (object);
GtkArrowPriv *priv = arrow->priv;
GtkArrowPrivate *priv = arrow->priv;
switch (prop_id)
{
......@@ -156,7 +156,7 @@ gtk_arrow_get_property (GObject *object,
GParamSpec *pspec)
{
GtkArrow *arrow = GTK_ARROW (object);
GtkArrowPriv *priv = arrow->priv;
GtkArrowPrivate *priv = arrow->priv;
switch (prop_id)
{
......@@ -175,12 +175,12 @@ gtk_arrow_get_property (GObject *object,
static void
gtk_arrow_init (GtkArrow *arrow)
{
GtkArrowPriv *priv;
GtkArrowPrivate *priv;
gint xpad, ypad;
arrow->priv = G_TYPE_INSTANCE_GET_PRIVATE (arrow,
GTK_TYPE_ARROW,
GtkArrowPriv);
GtkArrowPrivate);
priv = arrow->priv;
gtk_widget_set_has_window (GTK_WIDGET (arrow), FALSE);
......@@ -206,7 +206,7 @@ GtkWidget*
gtk_arrow_new (GtkArrowType arrow_type,
GtkShadowType shadow_type)
{
GtkArrowPriv *priv;
GtkArrowPrivate *priv;
GtkArrow *arrow;
arrow = g_object_new (GTK_TYPE_ARROW, NULL);
......@@ -232,7 +232,7 @@ gtk_arrow_set (GtkArrow *arrow,
GtkArrowType arrow_type,
GtkShadowType shadow_type)
{
GtkArrowPriv *priv;
GtkArrowPrivate *priv;
GtkWidget *widget;
g_return_if_fail (GTK_IS_ARROW (arrow));
......@@ -272,7 +272,7 @@ gtk_arrow_expose (GtkWidget *widget,
if (gtk_widget_is_drawable (widget))
{
GtkArrow *arrow = GTK_ARROW (widget);
GtkArrowPriv *priv = arrow->priv;
GtkArrowPrivate *priv = arrow->priv;
GtkMisc *misc = GTK_MISC (widget);
GtkShadowType shadow_type;
gint width, height;
......
......@@ -45,16 +45,16 @@ G_BEGIN_DECLS
#define GTK_IS_ARROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW))
#define GTK_ARROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ARROW, GtkArrowClass))
typedef struct _GtkArrow GtkArrow;
typedef struct _GtkArrowPriv GtkArrowPriv;
typedef struct _GtkArrowClass GtkArrowClass;
typedef struct _GtkArrow GtkArrow;
typedef struct _GtkArrowPrivate GtkArrowPrivate;
typedef struct _GtkArrowClass GtkArrowClass;
struct _GtkArrow
{
GtkMisc misc;
/*< private >*/
GtkArrowPriv *priv;
GtkArrowPrivate *priv;
};
struct _GtkArrowClass
......
......@@ -50,7 +50,7 @@
struct _GtkAspectFramePriv
struct _GtkAspectFramePrivate
{
GtkAllocation center_allocation;
......@@ -128,17 +128,17 @@ gtk_aspect_frame_class_init (GtkAspectFrameClass *class)
TRUE,
GTK_PARAM_READWRITE));
g_type_class_add_private (class, sizeof (GtkAspectFramePriv));
g_type_class_add_private (class, sizeof (GtkAspectFramePrivate));
}
static void
gtk_aspect_frame_init (GtkAspectFrame *aspect_frame)
{
GtkAspectFramePriv *priv;
GtkAspectFramePrivate *priv;
aspect_frame->priv = G_TYPE_INSTANCE_GET_PRIVATE (aspect_frame,
GTK_TYPE_ASPECT_FRAME,
GtkAspectFramePriv);
GtkAspectFramePrivate);
priv = aspect_frame->priv;
priv->xalign = 0.5;
......@@ -154,7 +154,7 @@ gtk_aspect_frame_set_property (GObject *object,
GParamSpec *pspec)
{
GtkAspectFrame *aspect_frame = GTK_ASPECT_FRAME (object);
GtkAspectFramePriv *priv = aspect_frame->priv;
GtkAspectFramePrivate *priv = aspect_frame->priv;
switch (prop_id)
{
......@@ -200,7 +200,7 @@ gtk_aspect_frame_get_property (GObject *object,
GParamSpec *pspec)
{
GtkAspectFrame *aspect_frame = GTK_ASPECT_FRAME (object);
GtkAspectFramePriv *priv = aspect_frame->priv;
GtkAspectFramePrivate *priv = aspect_frame->priv;
switch (prop_id)
{
......@@ -247,7 +247,7 @@ gtk_aspect_frame_new (const gchar *label,
gboolean obey_child)
{
GtkAspectFrame *aspect_frame;
GtkAspectFramePriv *priv;
GtkAspectFramePrivate *priv;
aspect_frame = g_object_new (GTK_TYPE_ASPECT_FRAME, NULL);
......@@ -285,7 +285,7 @@ gtk_aspect_frame_set (GtkAspectFrame *aspect_frame,
gfloat ratio,
gboolean obey_child)
{
GtkAspectFramePriv *priv;
GtkAspectFramePrivate *priv;
g_return_if_fail (GTK_IS_ASPECT_FRAME (aspect_frame));
......@@ -334,7 +334,7 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame *frame,
GtkAllocation *child_allocation)
{
GtkAspectFrame *aspect_frame = GTK_ASPECT_FRAME (frame);
GtkAspectFramePriv *priv = aspect_frame->priv;
GtkAspectFramePrivate *priv = aspect_frame->priv;
GtkBin *bin = GTK_BIN (frame);
GtkWidget *child;
gdouble ratio;
......
......@@ -44,16 +44,16 @@ G_BEGIN_DECLS
#define GTK_IS_ASPECT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASPECT_FRAME))
#define GTK_ASPECT_FRAME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass))
typedef struct _GtkAspectFrame GtkAspectFrame;
typedef struct _GtkAspectFramePriv GtkAspectFramePriv;
typedef struct _GtkAspectFrameClass GtkAspectFrameClass;
typedef struct _GtkAspectFrame GtkAspectFrame;
typedef struct _GtkAspectFramePrivate GtkAspectFramePrivate;
typedef struct _GtkAspectFrameClass GtkAspectFrameClass;
struct _GtkAspectFrame
{
GtkFrame frame;
/*< private >*/
GtkAspectFramePriv *priv;
GtkAspectFramePrivate *priv;
};
struct _GtkAspectFrameClass
......
......@@ -59,7 +59,7 @@
#include "gtkintl.h"
struct _GtkButtonBoxPriv
struct _GtkButtonBoxPrivate
{
GtkButtonBoxStyle layout_style;
};
......@@ -185,17 +185,17 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
FALSE,
GTK_PARAM_READWRITE));
g_type_class_add_private (class, sizeof (GtkButtonBoxPriv));
g_type_class_add_private (class, sizeof (GtkButtonBoxPrivate));
}
static void
gtk_button_box_init (GtkButtonBox *button_box)
{
GtkButtonBoxPriv *priv;
GtkButtonBoxPrivate *priv;
button_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (button_box,
GTK_TYPE_BUTTON_BOX,
GtkButtonBoxPriv);
GtkButtonBoxPrivate);
priv = button_box->priv;
gtk_box_set_spacing (GTK_BOX (button_box), 0);
......@@ -226,7 +226,7 @@ gtk_button_box_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
GtkButtonBoxPriv *priv = GTK_BUTTON_BOX (object)->priv;
GtkButtonBoxPrivate *priv = GTK_BUTTON_BOX (object)->priv;
switch (prop_id)
{
......@@ -303,7 +303,7 @@ void
gtk_button_box_set_layout (GtkButtonBox *widget,
GtkButtonBoxStyle layout_style)
{
GtkButtonBoxPriv *priv;
GtkButtonBoxPrivate *priv;
g_return_if_fail (GTK_IS_BUTTON_BOX (widget));
......@@ -404,7 +404,7 @@ gtk_button_box_child_requisition (GtkWidget *widget,
gint **widths,
gint **heights)
{
GtkButtonBoxPriv *priv;
GtkButtonBoxPrivate *priv;
GtkButtonBox *bbox;
GList *children, *list;
gint nchildren;
......@@ -531,7 +531,7 @@ static void
gtk_button_box_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkButtonBoxPriv *priv;
GtkButtonBoxPrivate *priv;
GtkButtonBox *bbox;
gint nvis_children;
gint max_size;
......@@ -618,7 +618,7 @@ static void
gtk_button_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkButtonBoxPriv *priv;
GtkButtonBoxPrivate *priv;
GtkButtonBox *bbox;
GList *children, *list;
GtkAllocation child_allocation;
......
......@@ -44,16 +44,16 @@ G_BEGIN_DECLS
#define GTK_BUTTON_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
typedef struct _GtkButtonBox GtkButtonBox;
typedef struct _GtkButtonBoxPriv GtkButtonBoxPriv;
typedef struct _GtkButtonBoxClass GtkButtonBoxClass;
typedef struct _GtkButtonBox GtkButtonBox;
typedef struct _GtkButtonBoxPrivate GtkButtonBoxPrivate;
typedef struct _GtkButtonBoxClass GtkButtonBoxClass;
struct _GtkButtonBox
{
GtkBox box;
/*< private >*/
GtkButtonBoxPriv *priv;
GtkButtonBoxPrivate *priv;
};
struct _GtkButtonBoxClass
......
......@@ -43,7 +43,7 @@
#include "gtkintl.h"
struct _GtkBinPriv
struct _GtkBinPrivate
{
GtkWidget *child;
};
......@@ -88,17 +88,17 @@ gtk_bin_class_init (GtkBinClass *class)
container_class->forall = gtk_bin_forall;
container_class->child_type = gtk_bin_child_type;
g_type_class_add_private (class, sizeof (GtkBinPriv));
g_type_class_add_private (class, sizeof (GtkBinPrivate));
}
static void
gtk_bin_init (GtkBin *bin)
{
GtkBinPriv *priv;
GtkBinPrivate *priv;
bin->priv = G_TYPE_INSTANCE_GET_PRIVATE (bin,
GTK_TYPE_BIN,
GtkBinPriv);
GtkBinPrivate);
priv = bin->priv;
gtk_widget_set_has_window (GTK_WIDGET (bin), FALSE);
......@@ -110,7 +110,7 @@ gtk_bin_init (GtkBin *bin)
static GType
gtk_bin_child_type (GtkContainer *container)
{
GtkBinPriv *priv = GTK_BIN (container)->priv;
GtkBinPrivate *priv = GTK_BIN (container)->priv;
if (!priv->child)
return GTK_TYPE_WIDGET;
......@@ -123,7 +123,7 @@ gtk_bin_add (GtkContainer *container,
GtkWidget *child)
{
GtkBin *bin = GTK_BIN (container);
GtkBinPriv *priv = bin->priv;
GtkBinPrivate *priv = bin->priv;
if (priv->child != NULL)
{
......@@ -146,7 +146,7 @@ gtk_bin_remove (GtkContainer *container,
GtkWidget *child)
{
GtkBin *bin = GTK_BIN (container);
GtkBinPriv *priv = bin->priv;
GtkBinPrivate *priv = bin->priv;
gboolean widget_was_visible;
g_return_if_fail (priv->child == child);
......@@ -170,7 +170,7 @@ gtk_bin_forall (GtkContainer *container,
gpointer callback_data)
{
GtkBin *bin = GTK_BIN (container);
GtkBinPriv *priv = bin->priv;
GtkBinPrivate *priv = bin->priv;
if (priv->child)
(* callback) (priv->child, callback_data);
......@@ -200,7 +200,7 @@ static GtkSizeRequestMode
gtk_bin_get_request_mode (GtkSizeRequest *widget)
{
GtkBin *bin = GTK_BIN (widget);
GtkBinPriv *priv = bin->priv;
GtkBinPrivate *priv = bin->priv;
if (priv->child)
return gtk_size_request_get_request_mode (GTK_SIZE_REQUEST (priv->child));
......@@ -213,7 +213,7 @@ get_child_padding_delta (GtkBin *bin,
gint *delta_h,
gint *delta_v)
{
GtkBinPriv *priv = bin->priv;
GtkBinPrivate *priv = bin->priv;
gint hmin, vmin, child_hmin, child_vmin;
gtk_size_request_get_width (GTK_SIZE_REQUEST (bin), &hmin, NULL);
......@@ -233,7 +233,7 @@ gtk_bin_get_width_for_height (GtkSizeRequest *widget,
gint *natural_width)
{
GtkBin *bin = GTK_BIN (widget);
GtkBinPriv *priv = bin->priv;
GtkBinPrivate *priv = bin->priv;
gint hdelta, vdelta, child_min, child_nat;
if (priv->child)
......@@ -261,7 +261,7 @@ gtk_bin_get_height_for_width (GtkSizeRequest *widget,
gint *natural_height)
{
GtkBin *bin = GTK_BIN (widget);
GtkBinPriv *priv = bin->priv;
GtkBinPrivate *priv = bin->priv;
gint hdelta, vdelta, child_min, child_nat;
if (priv->child)
......
......@@ -45,16 +45,16 @@ G_BEGIN_DECLS
#define GTK_BIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BIN, GtkBinClass))
typedef struct _GtkBin GtkBin;
typedef struct _GtkBinPriv GtkBinPriv;
typedef struct _GtkBinClass GtkBinClass;
typedef struct _GtkBin GtkBin;
typedef struct _GtkBinPrivate GtkBinPrivate;
typedef struct _GtkBinClass GtkBinClass;
struct _GtkBin
{
GtkContainer container;
/*< private >*/
GtkBinPriv *priv;
GtkBinPrivate *priv;
};
struct _GtkBinClass
......
......@@ -98,7 +98,7 @@ enum {
CHILD_PROP_POSITION
};
struct _GtkBoxPriv
struct _GtkBoxPrivate
{
GtkOrientation orientation;
......@@ -293,17 +293,17 @@ gtk_box_class_init (GtkBoxClass *class)
-1, G_MAXINT, 0,
GTK_PARAM_READWRITE));
g_type_class_add_private (object_class, sizeof (GtkBoxPriv));
g_type_class_add_private (object_class, sizeof (GtkBoxPrivate));
}
static void
gtk_box_init (GtkBox *box)
{
GtkBoxPriv *private;
GtkBoxPrivate *private;
box->priv = G_TYPE_INSTANCE_GET_PRIVATE (box,
GTK_TYPE_BOX,
GtkBoxPriv);
GtkBoxPrivate);
private = box->priv;
gtk_widget_set_has_window (GTK_WIDGET (box), FALSE);
......@@ -325,7 +325,7 @@ gtk_box_set_property (GObject *object,
GParamSpec *pspec)
{
GtkBox *box = GTK_BOX (object);
GtkBoxPriv *private = box->priv;
GtkBoxPrivate *private = box->priv;
switch (prop_id)
{
......@@ -352,7 +352,7 @@ gtk_box_get_property (GObject *object,
GParamSpec *pspec)
{
GtkBox *box = GTK_BOX (object);
GtkBoxPriv *private = box->priv;
GtkBoxPrivate *private = box->priv;
switch (prop_id)
{
......@@ -377,7 +377,7 @@ count_expand_children (GtkBox *box,
gint *visible_children,
gint *expand_children)
{
GtkBoxPriv *private = box->priv;
GtkBoxPrivate *private = box->priv;
GList *children;
GtkBoxChild *child;
......@@ -401,7 +401,7 @@ gtk_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkBox *box = GTK_BOX (widget);
GtkBoxPriv *private = box->priv;
GtkBoxPrivate *private = box->priv;
GtkBoxChild *child;
GList *children;
gint nvis_children;
......@@ -774,7 +774,7 @@ gtk_box_pack (GtkBox *box,
guint padding,
GtkPackType pack_type)
{
GtkBoxPriv *private = box->priv;
GtkBoxPrivate *private = box->priv;
GtkBoxChild *child_info;
g_return_if_fail (GTK_IS_BOX (box));
......@@ -818,7 +818,7 @@ gtk_box_size_request_init (GtkSizeRequestIface *iface)
static GtkSizeRequestMode
gtk_box_get_request_mode (GtkSizeRequest *widget)
{
GtkBoxPriv *private = GTK_BOX (widget)->priv;
GtkBoxPrivate *private = GTK_BOX (widget)->priv;
return (private->orientation == GTK_ORIENTATION_VERTICAL) ?
GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH : GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT;
......@@ -831,7 +831,7 @@ gtk_box_get_size (GtkSizeRequest *widget,
gint *natural_size)
{
GtkBox *box;
GtkBoxPriv *private;
GtkBoxPrivate *private;
GList *children;
gint nvis_children;
gint border_width;
......@@ -932,7 +932,7 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
gint *minimum_size,
gint *natural_size)
{
GtkBoxPriv *private = box->priv;
GtkBoxPrivate *private = box->priv;
GtkBoxChild *child;
GList *children;
gint nvis_children;
......@@ -1110,7 +1110,7 @@ gtk_box_compute_size_for_orientation (GtkBox *box,
gint *minimum_size,
gint *natural_size)
{
GtkBoxPriv *private = box->priv;
GtkBoxPrivate *private = box->priv;
GList *children;
gint nvis_children = 0;
gint required_size = 0, required_natural = 0, child_size, child_natural;
......@@ -1179,7 +1179,7 @@ gtk_box_get_width_for_height (GtkSizeRequest *widget,
gint *natural_width)
{
GtkBox *box = GTK_BOX (widget);
GtkBoxPriv *private = box->priv;
GtkBoxPrivate *private = box->priv;
if (private->orientation == GTK_ORIENTATION_VERTICAL)
gtk_box_compute_size_for_opposing_orientation (box, height, minimum_width, natural_width);
......@@ -1194,7 +1194,7 @@ gtk_box_get_height_for_width (GtkSizeRequest *widget,
gint *natural_height)
{
GtkBox *box = GTK_BOX (widget);
GtkBoxPriv *private = box->priv;
GtkBoxPrivate *private = box->priv;
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_box_compute_size_for_opposing_orientation (box, width, minimum_height, natural_height);
......@@ -1304,7 +1304,7 @@ void
gtk_box_set_homogeneous (GtkBox *box,
gboolean homogeneous)
{
GtkBoxPriv *private;
GtkBoxPrivate *private;
g_return_if_fail (GTK_IS_BOX (box));
......@@ -1347,7 +1347,7 @@ void
gtk_box_set_spacing (GtkBox *box,
gint spacing)
{
GtkBoxPriv *private;
GtkBoxPrivate *private;
g_return_if_fail (GTK_IS_BOX (box));
......@@ -1384,7 +1384,7 @@ void
_gtk_box_set_spacing_set (GtkBox *box,
gboolean spacing_set)
{
GtkBoxPriv *private;
GtkBoxPrivate *private;
g_return_if_fail (GTK_IS_BOX (box));
......@@ -1396,7 +1396,7 @@ _gtk_box_set_spacing_set (GtkBox *box,
gboolean
_gtk_box_get_spacing_set (GtkBox *box)
{
GtkBoxPriv *private;
GtkBoxPrivate *private;
g_return_val_if_fail (GTK_IS_BOX (box), FALSE);
...