diff options
| author | 11:03:30 Tim Janik <timj@imendio.com> | 2008-10-07 09:07:27 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2008-10-07 09:07:27 +0000 |
| commit | ddd556aff4d7aa0733d87814c37b53208a21b409 (patch) | |
| tree | f147dd2c44d335f7434f64d58285f33dcff4a60d | |
| parent | a23bb3bf88419514db60ed1da4add6302cc744a1 (diff) | |
| download | gtk+-ddd556aff4d7aa0733d87814c37b53208a21b409.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gtk/gtk.symbols | 1 | ||||
| -rw-r--r-- | gtk/gtkbox.c | 17 | ||||
| -rw-r--r-- | gtk/gtkbox.h | 4 | ||||
| -rw-r--r-- | gtk/gtkhbox.c | 2 | ||||
| -rw-r--r-- | gtk/gtkvbox.c | 2 |
6 files changed, 20 insertions, 12 deletions
@@ -1,3 +1,9 @@ +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. diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 20c89aa596..14778ac069 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -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 diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index c2fab0e32c..f14224e271 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -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; diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h index e9182a1160..8167aa9374 100644 --- a/gtk/gtkbox.h +++ b/gtk/gtkbox.h @@ -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); diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c index b5682f37e6..b917c4019d 100644 --- a/gtk/gtkhbox.c +++ b/gtk/gtkhbox.c @@ -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 * diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c index d017a1e26d..4fcd284d6c 100644 --- a/gtk/gtkvbox.c +++ b/gtk/gtkvbox.c @@ -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 * |