Putting in Diederick Niehorster's patch from e-mail dated 1/23/12 at 6:48 AM to fix the "WM_TOUCH" bugs inserted in the recent code changes
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1005 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
c8a0264fc4
commit
7c9b1f6d0d
@ -70,13 +70,6 @@ struct GXKeyList gxKeyList;
|
||||
# define MIN(a,b) (((a)<(b)) ? (a) : (b))
|
||||
#endif
|
||||
|
||||
#ifdef WM_TOUCH
|
||||
typedef BOOL (WINAPI *pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);
|
||||
typedef BOOL (WINAPI *pCloseTouchInputHandle)(HTOUCHINPUT);
|
||||
static pGetTouchInputInfo fghGetTouchInputInfo = (pGetTouchInputInfo)0xDEADBEEF;
|
||||
static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;
|
||||
#endif
|
||||
|
||||
extern void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height );
|
||||
extern void fgPlatformDisplayWindow ( SFG_Window *window );
|
||||
extern void fgPlatformSleepForEvents( long msec );
|
||||
|
@ -89,11 +89,6 @@
|
||||
#endif /* TARGET_HOST_POSIX_X11 */
|
||||
|
||||
|
||||
#ifdef WM_TOUCH
|
||||
typedef BOOL (WINAPI *pRegisterTouchWindow)(HWND,ULONG);
|
||||
static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;
|
||||
#endif
|
||||
|
||||
/* pushing attribute/value pairs into an array */
|
||||
#define ATTRIB(a) attributes[where++]=(a)
|
||||
#define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);}
|
||||
|
@ -35,6 +35,13 @@ extern void fgNewWGLCreateContext( SFG_Window* window );
|
||||
extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
|
||||
unsigned char layer_type );
|
||||
|
||||
#ifdef WM_TOUCH
|
||||
typedef BOOL (WINAPI *pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);
|
||||
typedef BOOL (WINAPI *pCloseTouchInputHandle)(HTOUCHINPUT);
|
||||
static pGetTouchInputInfo fghGetTouchInputInfo = (pGetTouchInputInfo)0xDEADBEEF;
|
||||
static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
|
||||
|
@ -90,6 +90,11 @@ extern int fghIsLegacyContextRequested( void );
|
||||
extern void fghContextCreationError( void );
|
||||
extern int fghNumberOfAuxBuffersRequested( void );
|
||||
|
||||
#ifdef WM_TOUCH
|
||||
typedef BOOL (WINAPI *pRegisterTouchWindow)(HWND,ULONG);
|
||||
static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Setup the pixel format for a Win32 window
|
||||
|
Reference in New Issue
Block a user