Fix memory leak when a spacer is added, and crash when a window is added before wxSiz...

[wxWidgets.git] / src / gtk1 / win_gtk.c

diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c
index 97eec73b973b07b97663783791c260e2c5523ce3..526fd5e116dda679fcca77a2d3ab08135b0abace 100644 (file)
--- a/src/gtk1/win_gtk.c
+++ b/src/gtk1/win_gtk.c
@@ -104,10 +104,10 @@ static GtkContainerClass *pizza_parent_class = NULL;
 
 static gboolean gravity_works;
 
 
 static gboolean gravity_works;
 

-guint
+GtkType

 gtk_pizza_get_type ()
 {
 gtk_pizza_get_type ()
 {

-    static guint pizza_type = 0;
+    static GtkType pizza_type = 0;

 
     if (!pizza_type)
     {
 
     if (!pizza_type)
     {


@@ -146,8 +146,8 @@ gtk_pizza_get_type ()
 }
 
 #if __WXGTK20__
 }
 
 #if __WXGTK20__

-// Marshaller needed for set_scroll_adjustments signal,
-//   generated with GLib-2.4.6 glib-genmarshal
+/* Marshaller needed for set_scroll_adjustments signal,
+   generated with GLib-2.4.6 glib-genmarshal */

 #define g_marshal_value_peek_object(v)   g_value_get_object (v)
 static void
 g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
 #define g_marshal_value_peek_object(v)   g_value_get_object (v)
 static void
 g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,


@@ -184,7 +184,7 @@ g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
             g_marshal_value_peek_object (param_values + 2),
             data2);
 }
             g_marshal_value_peek_object (param_values + 2),
             data2);
 }

-#endif // __WXGTK20__
+#endif /* __WXGTK20__ */

 
 static void
 gtk_pizza_class_init (GtkPizzaClass *klass)
 
 static void
 gtk_pizza_class_init (GtkPizzaClass *klass)


@@ -238,7 +238,7 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
                     GTK_SIGNAL_OFFSET (GtkPizzaClass, set_scroll_adjustments),
                     gtk_marshal_NONE__POINTER_POINTER,
                     GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
                     GTK_SIGNAL_OFFSET (GtkPizzaClass, set_scroll_adjustments),
                     gtk_marshal_NONE__POINTER_POINTER,
                     GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);

-#endif // __WXGTK20__
+#endif /* __WXGTK20__ */

 }
 
 static GtkType
 }
 
 static GtkType