comparison 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
comparison
equal deleted inserted replaced
4745:0aaa54fbd2bc 4746:0c39b36dd104
43 /* WIN32_LEAN_AND_MEAN was defined, so we have to include this by hand */ 43 /* WIN32_LEAN_AND_MEAN was defined, so we have to include this by hand */
44 #include <objbase.h> 44 #include <objbase.h>
45 #include "ddraw.h" 45 #include "ddraw.h"
46 #endif 46 #endif
47 47
48 #include "wactab/wintab.h"
49 #define PACKETDATA ( PK_X | PK_Y | PK_BUTTONS | PK_NORMAL_PRESSURE | PK_CURSOR)
50 #define PACKETMODE 0
51 #include "wactab/pktdef.h"
52
53 #include "SDL_win32events.h" 48 #include "SDL_win32events.h"
54 #include "SDL_win32gamma.h" 49 #include "SDL_win32gamma.h"
55 #include "SDL_win32keyboard.h" 50 #include "SDL_win32keyboard.h"
56 #include "SDL_win32modes.h" 51 #include "SDL_win32modes.h"
57 #include "SDL_win32mouse.h" 52 #include "SDL_win32mouse.h"
77 #if SDL_VIDEO_RENDER_DDRAW 72 #if SDL_VIDEO_RENDER_DDRAW
78 HANDLE ddrawDLL; 73 HANDLE ddrawDLL;
79 IDirectDraw *ddraw; 74 IDirectDraw *ddraw;
80 #endif 75 #endif
81 76
82 /* *INDENT-OFF* */
83 /* Function pointers for the Wacom API */
84 HANDLE wintabDLL;
85 UINT (*WTInfoA) (UINT, UINT, LPVOID);
86 HCTX (*WTOpenA) (HWND, LPLOGCONTEXTA, BOOL);
87 int (*WTPacket) (HCTX, UINT, LPVOID);
88 BOOL (*WTClose) (HCTX);
89 /* *INDENT-ON* */
90
91 int keyboard;
92 const SDL_scancode *key_layout; 77 const SDL_scancode *key_layout;
93 } SDL_VideoData; 78 } SDL_VideoData;
94 79
95 #endif /* _SDL_win32video_h */ 80 #endif /* _SDL_win32video_h */
96 81