made XPM data const

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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 97eec73b973b07b97663783791c260e2c5523ce3..280f57a98b4b1331115edce7bb88c6a704b3a4b7 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -104,10 +104,10 @@ static GtkContainerClass *pizza_parent_class = NULL;
 
 static gboolean gravity_works;
 
-guint
+GtkType
 gtk_pizza_get_type ()
 {
-    static guint pizza_type = 0;
+    static GtkType pizza_type = 0;
 
     if (!pizza_type)
     {
@@ -145,9 +145,9 @@ gtk_pizza_get_type ()
     return pizza_type;
 }
 
-#if __WXGTK20__
-// Marshaller needed for set_scroll_adjustments signal,
-//   generated with GLib-2.4.6 glib-genmarshal
+#ifdef __WXGTK20__
+/* 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,
@@ -184,7 +184,7 @@ g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
             g_marshal_value_peek_object (param_values + 2),
             data2);
 }
-#endif // __WXGTK20__
+#endif /* __WXGTK20__ */
 
 static void
 gtk_pizza_class_init (GtkPizzaClass *klass)
@@ -218,7 +218,7 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
     klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments;
 
     widget_class->set_scroll_adjustments_signal =
-#if __WXGTK20__
+#ifdef __WXGTK20__
         g_signal_new(
             "set_scroll_adjustments",
             G_TYPE_FROM_CLASS(object_class),
@@ -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);
-#endif // __WXGTK20__
+#endif /* __WXGTK20__ */
 }
 
 static GtkType