X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_cursor.c;h=bf5d2eb8036d3c595d1344550f5a8b7fdae33cc4;hb=006650e1dd72e73249d41e2bcea8b1668262a999;hp=50f0b42cfcaf46be234262c6038ff3bad2e51f58;hpb=d6ccf7c81bdad11e6902a258e8e21fdbe6b9f968;p=freeglut diff --git a/src/freeglut_cursor.c b/src/freeglut_cursor.c index 50f0b42..bf5d2eb 100644 --- a/src/freeglut_cursor.c +++ b/src/freeglut_cursor.c @@ -49,7 +49,7 @@ #if TARGET_HOST_UNIX_X11 -int fgGetCursorError( Cursor cursor ) +static int fghGetCursorError( Cursor cursor ) { int ret = 0; char buf[ 256 ]; @@ -90,7 +90,7 @@ void FGAPIENTRY glutSetCursor( int cursorID ) /* * Open issues: * (a) Partial error checking. Is that a problem? - * Is fgGetCursorError() correct? Should we abort on errors? + * Is fghGetCursorError() correct? Should we abort on errors? * Should there be a freeglut-wide X error handler? Should * we use the X error-handler mechanism? * (b) FULL_CROSSHAIR demotes to plain CROSSHAIR. Old GLUT allows @@ -171,7 +171,7 @@ void FGAPIENTRY glutSetCursor( int cursorID ) return; } - error = fgGetCursorError( cursor ); + error = fghGetCursorError( cursor ); if( GLUT_CURSOR_INHERIT == cursorID ) XUndefineCursor( fgDisplay.Display, @@ -186,7 +186,7 @@ void FGAPIENTRY glutSetCursor( int cursorID ) } } -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE /* * This is a temporary solution only... @@ -250,16 +250,14 @@ void FGAPIENTRY glutWarpPointer( int x, int y ) ); XFlush( fgDisplay.Display ); /* XXX Is this really necessary? */ -#elif TARGET_HOST_WIN32 +#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE { POINT coords; coords.x = x; coords.y = y; - /* - * ClientToScreen() translates {coords} for us. - */ + /* ClientToScreen() translates {coords} for us. */ ClientToScreen( fgStructure.Window->Window.Handle, &coords ); SetCursorPos( coords.x, coords.y ); }