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 c58253b29e269b89417e1f53ad8d125656219d35..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;
@@ -85,7 +84,6 @@ struct _GdkDevicePrivate
 
   gint *last_axis_data;
   gint last_buttons;
-#ifdef HAVE_WINTAB
   /* WINTAB stuff: */
   HCTX hctx;
   /* Cursor number */
@@ -96,7 +94,6 @@ struct _GdkDevicePrivate
   UINT npbtnmarks[2];
   /* Azimuth and altitude axis */
   AXIS orientation_axes[2];
-#endif
 };
 
 struct _GdkInputWindow
@@ -137,13 +134,9 @@ GdkTimeCoord ** _gdk_device_allocate_history (GdkDevice *device,
 /* 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);
 
@@ -170,4 +163,7 @@ gboolean         _gdk_device_get_history     (GdkDevice         *device,
                                              GdkTimeCoord    ***events,
                                              gint              *n_events);
 
+void           _gdk_input_wintab_init_check (void);
+void           _gdk_input_set_tablet_active (void);
+
 #endif /* __GDK_INPUT_WIN32_H__ */