Annotation of /trunk/freeglut/patches/freeglut-2.4.0-cursor.patch
Parent Directory
| 
Revision Log
Revision 260 -
(hide annotations)
(download)
Sun Jul 8 22:33:27 2007 UTC (16 years, 11 months ago) by niro
File size: 760 byte(s)
Sun Jul 8 22:33:27 2007 UTC (16 years, 11 months ago) by niro
File size: 760 byte(s)
-upstream fix
| 1 | niro | 260 | --- src/freeglut_cursor.c.old 2006-10-11 20:49:13.000000000 +0200 |
| 2 | +++ src/freeglut_cursor.c 2006-10-11 20:51:43.000000000 +0200 | ||
| 3 | @@ -147,11 +147,13 @@ | ||
| 4 | } | ||
| 5 | } | ||
| 6 | |||
| 7 | - if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) ) { | ||
| 8 | + if ( cursorIDToUse == GLUT_CURSOR_INHERIT ) { | ||
| 9 | + XUndefineCursor( fgDisplay.Display, window->Window.Handle ); | ||
| 10 | + } else if ( cursor != None ) { | ||
| 11 | + XDefineCursor( fgDisplay.Display, window->Window.Handle, cursor ); | ||
| 12 | + } else if ( cursorIDToUse != GLUT_CURSOR_NONE ) { | ||
| 13 | fgError( "Failed to create cursor" ); | ||
| 14 | } | ||
| 15 | - XDefineCursor( fgDisplay.Display, | ||
| 16 | - window->Window.Handle, cursor ); | ||
| 17 | } | ||
| 18 | |||
| 19 | #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE |