From 322a290199ae3eb9c8490f0502d6a8d1b4754dbc Mon Sep 17 00:00:00 2001 From: fayjf Date: Wed, 13 Jul 2005 20:25:07 +0000 Subject: [PATCH] Fixing a cursor bug in \"GLUT_CURSOR_INHERIT\" git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@677 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/freeglut_cursor.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/freeglut/freeglut/src/freeglut_cursor.c b/freeglut/freeglut/src/freeglut_cursor.c index d32ba5c..5542a2d 100644 --- a/freeglut/freeglut/src/freeglut_cursor.c +++ b/freeglut/freeglut/src/freeglut_cursor.c @@ -147,11 +147,13 @@ void fgSetCursor ( SFG_Window *window, int cursorID ) } } - if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) ) { + if ( cursorIDToUse == GLUT_CURSOR_INHERIT ) + XUndefineCursor( fgDisplay.Display, window->Window.Handle ); + if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) ) fgError( "Failed to create cursor" ); - } - XDefineCursor( fgDisplay.Display, - window->Window.Handle, cursor ); + else + XDefineCursor( fgDisplay.Display, + window->Window.Handle, cursor ); } #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE