Commit ddd556af authored by 11:03:30  Tim Janik's avatar 11:03:30 Tim Janik Committed by Tim Janik

keep GtkBox as an abstract type and keep _gtk_box_new() as private

2008-10-07 11:03:30  Tim Janik  <timj@imendio.com>

        * gtk/gtkbox.h: keep GtkBox as an abstract type and keep _gtk_box_new()
        as private function until we settle on the exact semantics.
        renamed _gtk_box_set_old_defaults() as suggested by Mitch.


svn path=/trunk/; revision=21599
parent a23bb3bf
2008-10-07 11:03:30 Tim Janik <timj@imendio.com>
* gtk/gtkbox.h: keep GtkBox as an abstract type and keep _gtk_box_new()
as private function until we settle on the exact semantics.
renamed _gtk_box_set_old_defaults() as suggested by Mitch.
2008-10-07 Michael Natterer <mitch@imendio.com>
* gtk/gtkbox.c: reindent static prototypes.
......
......@@ -427,7 +427,6 @@ gtk_bin_get_type G_GNUC_CONST
gtk_box_get_homogeneous
gtk_box_get_spacing
gtk_box_get_type G_GNUC_CONST
gtk_box_new
gtk_box_pack_end
gtk_box_pack_start
#ifndef GTK_DISABLE_DEPRECATED
......
......@@ -96,10 +96,13 @@ static void gtk_box_get_child_property (GtkContainer *container,
static GType gtk_box_child_type (GtkContainer *container);
#if 0
G_DEFINE_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER,
G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
NULL))
NULL));
#else
G_DEFINE_ABSTRACT_TYPE (GtkBox, gtk_box, GTK_TYPE_CONTAINER);
#endif
static void
gtk_box_class_init (GtkBoxClass *class)
......@@ -775,10 +778,10 @@ gtk_box_pack (GtkBox *box,
*
* Since: 2.16
**/
GtkWidget *
gtk_box_new (GtkOrientation orientation,
gboolean homogeneous,
gint spacing)
GtkWidget*
_gtk_box_new (GtkOrientation orientation,
gboolean homogeneous,
gint spacing)
{
return g_object_new (GTK_TYPE_BOX,
"orientation", orientation,
......@@ -1170,7 +1173,7 @@ gtk_box_set_child_packing (GtkBox *box,
}
void
_gtk_box_set_default_expand (GtkBox *box)
_gtk_box_set_old_defaults (GtkBox *box)
{
GtkBoxPrivate *private;
......
......@@ -78,7 +78,7 @@ struct _GtkBoxChild
GType gtk_box_get_type (void) G_GNUC_CONST;
GtkWidget * gtk_box_new (GtkOrientation orientation,
GtkWidget* _gtk_box_new (GtkOrientation orientation,
gboolean homogeneous,
gint spacing);
......@@ -125,7 +125,7 @@ void gtk_box_set_child_packing (GtkBox *box,
GtkPackType pack_type);
/* internal API */
void _gtk_box_set_default_expand (GtkBox *box);
void _gtk_box_set_old_defaults (GtkBox *box);
gboolean _gtk_box_get_spacing_set (GtkBox *box);
void _gtk_box_set_spacing_set (GtkBox *box,
gboolean spacing_set);
......
......@@ -43,7 +43,7 @@ gtk_hbox_init (GtkHBox *hbox)
gtk_orientable_set_orientation (GTK_ORIENTABLE (hbox),
GTK_ORIENTATION_HORIZONTAL);
_gtk_box_set_default_expand (GTK_BOX (hbox));
_gtk_box_set_old_defaults (GTK_BOX (hbox));
}
GtkWidget *
......
......@@ -43,7 +43,7 @@ gtk_vbox_init (GtkVBox *vbox)
gtk_orientable_set_orientation (GTK_ORIENTABLE (vbox),
GTK_ORIENTATION_VERTICAL);
_gtk_box_set_default_expand (GTK_BOX (vbox));
_gtk_box_set_old_defaults (GTK_BOX (vbox));
}
GtkWidget *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment