From 1114cde95ebfcfedf5969b0484a0c94b8f79cb14 Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Tue, 24 Jan 2012 00:09:40 +0000 Subject: [PATCH 1/1] 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: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1005 7f0cb862-5218-0410-a997-914c9d46530a --- src/Common/freeglut_main.c | 7 ------- src/Common/freeglut_window.c | 5 ----- src/mswin/freeglut_main_mswin.c | 7 +++++++ src/mswin/freeglut_window_mswin.c | 5 +++++ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Common/freeglut_main.c b/src/Common/freeglut_main.c index 8c59640..b1654a5 100644 --- a/src/Common/freeglut_main.c +++ b/src/Common/freeglut_main.c @@ -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 ); diff --git a/src/Common/freeglut_window.c b/src/Common/freeglut_window.c index 1d409b3..8a44d1a 100644 --- a/src/Common/freeglut_window.c +++ b/src/Common/freeglut_window.c @@ -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);} diff --git a/src/mswin/freeglut_main_mswin.c b/src/mswin/freeglut_main_mswin.c index 96ec77b..ca1f878 100644 --- a/src/mswin/freeglut_main_mswin.c +++ b/src/mswin/freeglut_main_mswin.c @@ -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 ) diff --git a/src/mswin/freeglut_window_mswin.c b/src/mswin/freeglut_window_mswin.c index fe93985..655820f 100644 --- a/src/mswin/freeglut_window_mswin.c +++ b/src/mswin/freeglut_window_mswin.c @@ -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 -- 1.7.10.4