Silently return NULL if the widget is not realized. (#316023, Guillaume

[~andy/gtk] / gtk / gtkhbbox.c

diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c
index 5c6c18555a19c813c41694b3e2cfde5c69e29861..3dda89c16fd430ca632b903e61ca354ee4ce3911 100644 (file)
--- a/gtk/gtkhbbox.c
+++ b/gtk/gtkhbbox.c
@@ -24,7 +24,10 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
 #include "gtkhbbox.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
 
 
 static void gtk_hbutton_box_class_init    (GtkHButtonBoxClass   *klass);
@@ -37,26 +40,29 @@ static void gtk_hbutton_box_size_allocate (GtkWidget      *widget,
 static gint default_spacing = 30;
 static gint default_layout_style = GTK_BUTTONBOX_EDGE;
 
-GtkType
+GType
 gtk_hbutton_box_get_type (void)
 {
-  static GtkType hbutton_box_type = 0;
+  static GType hbutton_box_type = 0;
 
   if (!hbutton_box_type)
     {
-      static const GtkTypeInfo hbutton_box_info =
+      static const GTypeInfo hbutton_box_info =
       {
-       "GtkHButtonBox",
-       sizeof (GtkHButtonBox),
        sizeof (GtkHButtonBoxClass),
-       (GtkClassInitFunc) gtk_hbutton_box_class_init,
-       (GtkObjectInitFunc) gtk_hbutton_box_init,
-       /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
+       NULL,           /* base_init */
+       NULL,           /* base_finalize */
+       (GClassInitFunc) gtk_hbutton_box_class_init,
+       NULL,           /* class_finalize */
+       NULL,           /* class_data */
+       sizeof (GtkHButtonBox),
+       0,              /* n_preallocs */
+       (GInstanceInitFunc) gtk_hbutton_box_init,
       };
 
-      hbutton_box_type = gtk_type_unique (GTK_TYPE_BUTTON_BOX, &hbutton_box_info);
+      hbutton_box_type =
+       g_type_register_static (GTK_TYPE_BUTTON_BOX, I_("GtkHButtonBox"),
+                               &hbutton_box_info, 0);
     }
 
   return hbutton_box_type;
@@ -84,7 +90,7 @@ gtk_hbutton_box_new (void)
 {
   GtkHButtonBox *hbutton_box;
 
-  hbutton_box = gtk_type_new (GTK_TYPE_HBUTTON_BOX);
+  hbutton_box = g_object_new (GTK_TYPE_HBUTTON_BOX, NULL);
 
   return GTK_WIDGET (hbutton_box);
 }
@@ -92,7 +98,8 @@ gtk_hbutton_box_new (void)
 
 /* set default value for spacing */
 
-void gtk_hbutton_box_set_spacing_default (gint spacing)
+void 
+gtk_hbutton_box_set_spacing_default (gint spacing)
 {
   default_spacing = spacing;
 }
@@ -100,7 +107,8 @@ void gtk_hbutton_box_set_spacing_default (gint spacing)
 
 /* set default value for layout style */
 
-void gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout)
+void 
+gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout)
 {
   g_return_if_fail (layout >= GTK_BUTTONBOX_DEFAULT_STYLE &&
                    layout <= GTK_BUTTONBOX_END);
@@ -110,7 +118,8 @@ void gtk_hbutton_box_set_layout_default (GtkButtonBoxStyle layout)
 
 /* get default value for spacing */
 
-gint gtk_hbutton_box_get_spacing_default (void)
+gint 
+gtk_hbutton_box_get_spacing_default (void)
 {
   return default_spacing;
 }
@@ -118,7 +127,8 @@ gint gtk_hbutton_box_get_spacing_default (void)
 
 /* get default value for layout style */
 
-GtkButtonBoxStyle gtk_hbutton_box_get_layout_default (void)
+GtkButtonBoxStyle
+gtk_hbutton_box_get_layout_default (void)
 {
   return default_layout_style;
 }
@@ -137,10 +147,6 @@ gtk_hbutton_box_size_request (GtkWidget      *widget,
   gint spacing;
   GtkButtonBoxStyle layout;
   
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_HBUTTON_BOX (widget));
-  g_return_if_fail (requisition != NULL);
-
   box = GTK_BOX (widget);
   bbox = GTK_BUTTON_BOX (widget);
 
@@ -209,10 +215,6 @@ gtk_hbutton_box_size_allocate (GtkWidget     *widget,
   GtkButtonBoxStyle layout;
   gint spacing;
   
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_HBUTTON_BOX (widget));
-  g_return_if_fail (allocation != NULL);
-
   base_box = GTK_BOX (widget);
   box = GTK_BUTTON_BOX (widget);
   hbox = GTK_HBUTTON_BOX (widget);
@@ -304,3 +306,5 @@ gtk_hbutton_box_size_allocate (GtkWidget     *widget,
     }
 }
   
+#define __GTK_HBUTTON_BOX_C__
+#include "gtkaliasdef.c"