diff src/video/win32/SDL_win32video.h @ 4746:0c39b36dd104

Merge
author dewyatt
date Tue, 06 Jul 2010 02:07:42 -0400
parents 3e69e077cb95
children eff4e88cc1e8 dc7bdcf06367
line wrap: on
line diff
--- a/src/video/win32/SDL_win32video.h	Tue Jul 06 02:06:17 2010 -0400
+++ b/src/video/win32/SDL_win32video.h	Tue Jul 06 02:07:42 2010 -0400
@@ -45,11 +45,6 @@
 #include "ddraw.h"
 #endif
 
-#include "wactab/wintab.h"
-#define PACKETDATA ( PK_X | PK_Y | PK_BUTTONS | PK_NORMAL_PRESSURE | PK_CURSOR)
-#define PACKETMODE 0
-#include "wactab/pktdef.h"
-
 #include "SDL_win32events.h"
 #include "SDL_win32gamma.h"
 #include "SDL_win32keyboard.h"
@@ -79,16 +74,6 @@
     IDirectDraw *ddraw;
 #endif
 
-/* *INDENT-OFF* */
-    /* Function pointers for the Wacom API */
-    HANDLE wintabDLL;
-    UINT (*WTInfoA) (UINT, UINT, LPVOID);
-    HCTX (*WTOpenA) (HWND, LPLOGCONTEXTA, BOOL);
-    int (*WTPacket) (HCTX, UINT, LPVOID);
-    BOOL (*WTClose) (HCTX);
-/* *INDENT-ON* */
-
-    int keyboard;
     const SDL_scancode *key_layout;
 } SDL_VideoData;