Build Wintab support always on Windows. Don't require the Wintab SDK.

[~andy/gtk] / gdk / win32 / gdkinput-win32.h

diff --git a/gdk/win32/gdkinput-win32.h b/gdk/win32/gdkinput-win32.h
index b8de5ad1b6d1f5d4f1facb3603d98b7f479c3c61..10dd368701875a37024743894ec0c8987aa5366d 100644 (file)
--- a/gdk/win32/gdkinput-win32.h
+++ b/gdk/win32/gdkinput-win32.h
@@ -27,9 +27,8 @@
 #ifndef __GDK_INPUT_WIN32_H__
 #define __GDK_INPUT_WIN32_H__
 
-#ifdef HAVE_WINTAB
+#include <windows.h>
 #include <wintab.h>
-#endif
 
 typedef struct _GdkAxisInfo    GdkAxisInfo;
 typedef struct _GdkDevicePrivate GdkDevicePrivate;
@@ -52,6 +51,11 @@ struct _GdkAxisInfo
   gint min_value, max_value;
 };
 
+struct _GdkDeviceClass
+{
+  GObjectClass parent_class;
+};
+
 #define GDK_INPUT_NUM_EVENTC 6
 
 struct _GdkDevicePrivate
@@ -80,7 +84,6 @@ struct _GdkDevicePrivate
 
   gint *last_axis_data;
   gint last_buttons;
-#ifdef HAVE_WINTAB
   /* WINTAB stuff: */
   HCTX hctx;
   /* Cursor number */
@@ -91,7 +94,6 @@ struct _GdkDevicePrivate
   UINT npbtnmarks[2];
   /* Azimuth and altitude axis */
   AXIS orientation_axes[2];
-#endif
 };
 
 struct _GdkInputWindow
@@ -116,39 +118,33 @@ struct _GdkInputWindow
 
 /* Global data */
 
-#define GDK_IS_CORE(d) (((GdkDevice *)(d)) == gdk_core_pointer)
+#define GDK_IS_CORE(d) (((GdkDevice *)(d)) == gdk_display_get_default ()->core_pointer)
 
-extern GList *gdk_input_devices;
-extern GList *gdk_input_windows;
+extern GList *_gdk_input_devices;
+extern GList *_gdk_input_windows;
 
-extern gint   gdk_input_ignore_core;
-
-extern GdkDevice gdk_input_core_info;
+extern gint   _gdk_input_ignore_core;
 
 /* Function declarations */
+void             _gdk_init_input_core (GdkDisplay *display);
 
-void gdk_input_window_destroy (GdkWindow *window);
 GdkTimeCoord ** _gdk_device_allocate_history (GdkDevice *device,
                                              gint       n_events);
 
 /* The following functions are provided by each implementation
  * (just wintab for now)
  */
-gint             _gdk_input_window_none_event(GdkEvent         *event,
-                                             MSG              *msg);
-void             _gdk_input_configure_event  (GdkEventConfigure *event,
-                                             GdkWindow         *window);
-void             _gdk_input_enter_event      (GdkEventCrossing  *event,
-                                             GdkWindow         *window);
-gint             _gdk_input_other_event      (GdkEvent         *event,
+void             _gdk_input_configure_event  (GdkWindow         *window);
+void             _gdk_input_enter_event      (GdkWindow         *window);
+gboolean         _gdk_input_other_event      (GdkEvent         *event,
                                              MSG              *msg,
                                              GdkWindow        *window);
 
 /* These should be in gdkinternals.h */
 
-GdkInputWindow   *gdk_input_window_find      (GdkWindow        *window);
+GdkInputWindow  *_gdk_input_window_find      (GdkWindow        *window);
 
-void              gdk_input_window_destroy   (GdkWindow *window);
+void             _gdk_input_window_destroy   (GdkWindow *window);
 
 gint             _gdk_input_enable_window    (GdkWindow        *window,
                                              GdkDevicePrivate *gdkdev);
@@ -167,13 +163,7 @@ gboolean         _gdk_device_get_history     (GdkDevice         *device,
                                              GdkTimeCoord    ***events,
                                              gint              *n_events);
 
-
-#define GDK_MAX_DEVICE_CLASSES 13
-
-gint             gdk_input_common_init        (gint              include_core);
-gint             gdk_input_common_other_event (GdkEvent          *event,
-                                              MSG               *msg,
-                                              GdkInputWindow    *input_window,
-                                              GdkWindow         *window);
+void           _gdk_input_wintab_init_check (void);
+void           _gdk_input_set_tablet_active (void);
 
 #endif /* __GDK_INPUT_WIN32_H__ */