Added Mac OS X resource file handling:

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

diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c
index 2ad696189bae03acaee9cc41cd397d41c87cb1a3..b1846597747f96c63f9c27c3e7ce5c00d797cde2 100644 (file)
--- a/src/gtk1/win_gtk.c
+++ b/src/gtk1/win_gtk.c
@@ -9,12 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
-#ifdef __VMS
-#define gtk_widget_get_child_requisition gtk_widget_get_child_requisitio
-#define gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINT
+#ifdef VMS
+#define XCheckIfEvent XCHECKIFEVENT
 #endif
 
-#include "wx/gtk/setup.h"
+#include "wx/setup.h"
 #include "wx/gtk/win_gtk.h"
 #include "gtk/gtksignal.h"
 #include "gtk/gtkprivate.h"
@@ -77,13 +76,13 @@ static void     gtk_pizza_adjust_allocations         (GtkPizza  *pizza,
                                                       gint       dy);
 
 
+/* unused */
+#if 0
 static void     gtk_pizza_expose_area        (GtkPizza       *pizza,
                                               gint            x,
                                               gint            y,
                                               gint            width,
                                               gint            height);
-/* unused */
-#if 0
 static void     gtk_pizza_adjustment_changed (GtkAdjustment  *adjustment,
                                               GtkPizza       *pizza);
 #endif
@@ -161,7 +160,12 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
     widget_class->set_scroll_adjustments_signal =
     gtk_signal_new ("set_scroll_adjustments",
                     GTK_RUN_LAST,
+
+#ifdef __WXGTK20__
                     GTK_CLASS_TYPE(object_class),
+#else
+                    object_class->type,
+#endif
                     GTK_SIGNAL_OFFSET (GtkPizzaClass, set_scroll_adjustments),
                     gtk_marshal_NONE__POINTER_POINTER,
                     GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
@@ -976,6 +980,8 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza,
 
 /* Callbacks */
 
+/* unused */
+#if 0
 /* Send a synthetic expose event to the widget
  */
 static void
@@ -1001,6 +1007,7 @@ gtk_pizza_expose_area (GtkPizza    *pizza,
         gdk_window_unref (event.window);
     }
 }
+#endif /* unused */
 
 /* This function is used to find events to process while scrolling
  */