FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1005 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-01-24 00:09:40 +00:00
parent c8a0264fc4
commit 7c9b1f6d0d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freeglut/freeglut/src/Common/freeglut_main.c
View File

@ -70,13 +70,6 @@ struct GXKeyList gxKeyList;
# define MIN(a,b) (((a)<(b)) ? (a) : (b)) # define MIN(a,b) (((a)<(b)) ? (a) : (b))
#endif #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 fgPlatformReshapeWindow ( SFG_Window *window, int width, int height );
extern void fgPlatformDisplayWindow ( SFG_Window *window ); extern void fgPlatformDisplayWindow ( SFG_Window *window );
extern void fgPlatformSleepForEvents( long msec ); extern void fgPlatformSleepForEvents( long msec );

5
freeglut/freeglut/src/Common/freeglut_window.c
View File

@ -89,11 +89,6 @@
#endif /* TARGET_HOST_POSIX_X11 */ #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 */ /* pushing attribute/value pairs into an array */
#define ATTRIB(a) attributes[where++]=(a) #define ATTRIB(a) attributes[where++]=(a)
#define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);} #define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);}

7
freeglut/freeglut/src/mswin/freeglut_main_mswin.c
View File

@ -35,6 +35,13 @@ extern void fgNewWGLCreateContext( SFG_Window* window );
extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
unsigned char layer_type ); 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 ) void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )

5
freeglut/freeglut/src/mswin/freeglut_window_mswin.c
View File

@ -90,6 +90,11 @@ extern int fghIsLegacyContextRequested( void );
extern void fghContextCreationError( void ); extern void fghContextCreationError( void );
extern int fghNumberOfAuxBuffersRequested( 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 * Setup the pixel format for a Win32 window