gtk+ r21599 - in trunk: . gtk

[timj svn gnome org]

Author: timj
Date: Tue Oct  7 09:07:27 2008
New Revision: 21599
URL: http://svn.gnome.org/viewvc/gtk+?rev=21599&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtk.symbols
   trunk/gtk/gtkbox.c
   trunk/gtk/gtkbox.h
   trunk/gtk/gtkhbox.c
   trunk/gtk/gtkvbox.c

Modified: trunk/gtk/gtk.symbols
==============================================================================
--- trunk/gtk/gtk.symbols	(original)
+++ trunk/gtk/gtk.symbols	Tue Oct  7 09:07:27 2008
@@ -427,7 +427,6 @@
 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

Modified: trunk/gtk/gtkbox.c
==============================================================================
--- trunk/gtk/gtkbox.c	(original)
+++ trunk/gtk/gtkbox.c	Tue Oct  7 09:07:27 2008
@@ -96,10 +96,13 @@
 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 @@
  *
  * 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 @@
 }
 
 void
-_gtk_box_set_default_expand (GtkBox *box)
+_gtk_box_set_old_defaults (GtkBox *box)
 {
   GtkBoxPrivate *private;
 

Modified: trunk/gtk/gtkbox.h
==============================================================================
--- trunk/gtk/gtkbox.h	(original)
+++ trunk/gtk/gtkbox.h	Tue Oct  7 09:07:27 2008
@@ -78,7 +78,7 @@
 
 
 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 @@
                                          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);

Modified: trunk/gtk/gtkhbox.c
==============================================================================
--- trunk/gtk/gtkhbox.c	(original)
+++ trunk/gtk/gtkhbox.c	Tue Oct  7 09:07:27 2008
@@ -43,7 +43,7 @@
   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 *

Modified: trunk/gtk/gtkvbox.c
==============================================================================
--- trunk/gtk/gtkvbox.c	(original)
+++ trunk/gtk/gtkvbox.c	Tue Oct  7 09:07:27 2008
@@ -43,7 +43,7 @@
   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 *