callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
11:03:30 Tim Janik
2008-10-07 09:07:27 +00:00
committed by Tim Janik
parent a23bb3bf88
commit ddd556aff4
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2008-10-07 Michael Natterer <mitch@imendio.com>
* gtk/gtkbox.c: reindent static prototypes. * gtk/gtkbox.c: reindent static prototypes.

1
gtk/gtk.symbols
View File

@ -427,7 +427,6 @@ gtk_bin_get_type G_GNUC_CONST
gtk_box_get_homogeneous gtk_box_get_homogeneous
gtk_box_get_spacing gtk_box_get_spacing
gtk_box_get_type G_GNUC_CONST gtk_box_get_type G_GNUC_CONST
gtk_box_new
gtk_box_pack_end gtk_box_pack_end
gtk_box_pack_start gtk_box_pack_start
#ifndef GTK_DISABLE_DEPRECATED #ifndef GTK_DISABLE_DEPRECATED

13
gtk/gtkbox.c
View File

@ -96,10 +96,13 @@ static void gtk_box_get_child_property (GtkContainer *container,
static GType gtk_box_child_type (GtkContainer *container); static GType gtk_box_child_type (GtkContainer *container);
#if 0
G_DEFINE_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER, G_DEFINE_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER,
G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
NULL)) NULL));
#else
G_DEFINE_ABSTRACT_TYPE (GtkBox, gtk_box, GTK_TYPE_CONTAINER);
#endif
static void static void
gtk_box_class_init (GtkBoxClass *class) gtk_box_class_init (GtkBoxClass *class)
@ -775,8 +778,8 @@ gtk_box_pack (GtkBox *box,
* *
* Since: 2.16 * Since: 2.16
**/ **/
GtkWidget * GtkWidget*
gtk_box_new (GtkOrientation orientation, _gtk_box_new (GtkOrientation orientation,
gboolean homogeneous, gboolean homogeneous,
gint spacing) gint spacing)
{ {
@ -1170,7 +1173,7 @@ gtk_box_set_child_packing (GtkBox *box,
} }
void void
_gtk_box_set_default_expand (GtkBox *box) _gtk_box_set_old_defaults (GtkBox *box)
{ {
GtkBoxPrivate *private; GtkBoxPrivate *private;

4
gtk/gtkbox.h
View File

@ -78,7 +78,7 @@ struct _GtkBoxChild
GType gtk_box_get_type (void) G_GNUC_CONST; GType gtk_box_get_type (void) G_GNUC_CONST;
GtkWidget * gtk_box_new (GtkOrientation orientation, GtkWidget* _gtk_box_new (GtkOrientation orientation,
gboolean homogeneous, gboolean homogeneous,
gint spacing); gint spacing);
@ -125,7 +125,7 @@ void gtk_box_set_child_packing (GtkBox *box,
GtkPackType pack_type); GtkPackType pack_type);
/* internal API */ /* 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); gboolean _gtk_box_get_spacing_set (GtkBox *box);
void _gtk_box_set_spacing_set (GtkBox *box, void _gtk_box_set_spacing_set (GtkBox *box,
gboolean spacing_set); gboolean spacing_set);

2
gtk/gtkhbox.c
View File

@ -43,7 +43,7 @@ gtk_hbox_init (GtkHBox *hbox)
gtk_orientable_set_orientation (GTK_ORIENTABLE (hbox), gtk_orientable_set_orientation (GTK_ORIENTABLE (hbox),
GTK_ORIENTATION_HORIZONTAL); GTK_ORIENTATION_HORIZONTAL);
_gtk_box_set_default_expand (GTK_BOX (hbox)); _gtk_box_set_old_defaults (GTK_BOX (hbox));
} }
GtkWidget * GtkWidget *

2
gtk/gtkvbox.c
View File

@ -43,7 +43,7 @@ gtk_vbox_init (GtkVBox *vbox)
gtk_orientable_set_orientation (GTK_ORIENTABLE (vbox), gtk_orientable_set_orientation (GTK_ORIENTABLE (vbox),
GTK_ORIENTATION_VERTICAL); GTK_ORIENTATION_VERTICAL);
_gtk_box_set_default_expand (GTK_BOX (vbox)); _gtk_box_set_old_defaults (GTK_BOX (vbox));
} }
GtkWidget * GtkWidget *