X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_cursor.c;h=78841bec1870e37d26b2554d670c5f5086aaf4e1;hb=0b29e3bf6d3736fa2dac4dfd792db622d490f004;hp=bda8083ec91a7dbc5e370f691e5cfbbb69afb1d8;hpb=7d0fc844c337b9c8901317d6935c3462b59ceda5;p=freeglut diff --git a/src/freeglut_cursor.c b/src/freeglut_cursor.c index bda8083..78841be 100644 --- a/src/freeglut_cursor.c +++ b/src/freeglut_cursor.c @@ -29,7 +29,7 @@ #include "config.h" #endif -#include "../include/GL/freeglut.h" +#include #include "freeglut_internal.h" #if TARGET_HOST_UNIX_X11 @@ -53,7 +53,7 @@ int fgGetCursorError( Cursor cursor ) { int ret = 0; char buf[ 256 ]; - + switch( cursor ) { case BadAlloc: @@ -110,7 +110,7 @@ void FGAPIENTRY glutSetCursor( int cursorID ) if( GLUT_CURSOR_FULL_CROSSHAIR == cursorID ) cursorID = GLUT_CURSOR_CROSSHAIR; - + switch( cursorID ) { MAP_CURSOR( GLUT_CURSOR_RIGHT_ARROW, XC_right_ptr); @@ -162,7 +162,7 @@ void FGAPIENTRY glutSetCursor( int cursorID ) 0, 0 ); break; } - + case GLUT_CURSOR_INHERIT: break; @@ -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... @@ -222,7 +222,7 @@ void FGAPIENTRY glutSetCursor( int cursorID ) MAP_CURSOR( GLUT_CURSOR_CROSSHAIR, IDC_CROSS ); /* MAP_CURSOR( GLUT_CURSOR_NONE, IDC_NO ); */ ZAP_CURSOR( GLUT_CURSOR_NONE, NULL ); - + default: MAP_CURSOR( GLUT_CURSOR_UP_DOWN, IDC_ARROW ); } @@ -250,10 +250,13 @@ 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 = { x, y }; + POINT coords; + coords.x = x; + coords.y = y; + /* * ClientToScreen() translates {coords} for us. */