diff options
| author | tnut <thierryn1 at hispeed dot ch> | 2009-11-23 22:04:20 +0100 |
|---|---|---|
| committer | tnut <thierryn1 at hispeed dot ch> | 2009-11-23 22:04:20 +0100 |
| commit | 69e089ddc125ffc018f8499d0bfbf03049f5bf3b (patch) | |
| tree | 031834021ad771f69e1d2d553065dc4f538ffe84 /extra/freeglut/glut-cursor-inherit.patch | |
| parent | 91311b0817e2e0b1a6dabb3743b19a391858cafc (diff) | |
| parent | ec3668450f4999fdb4294435dc5df4f41455666e (diff) | |
| download | nutyx-extra-69e089ddc125ffc018f8499d0bfbf03049f5bf3b.tar.gz nutyx-extra-69e089ddc125ffc018f8499d0bfbf03049f5bf3b.tar.bz2 nutyx-extra-69e089ddc125ffc018f8499d0bfbf03049f5bf3b.tar.xz nutyx-extra-69e089ddc125ffc018f8499d0bfbf03049f5bf3b.zip | |
Merge remote branch 'lesibel/master'
Diffstat (limited to 'extra/freeglut/glut-cursor-inherit.patch')
| -rw-r--r-- | extra/freeglut/glut-cursor-inherit.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/extra/freeglut/glut-cursor-inherit.patch b/extra/freeglut/glut-cursor-inherit.patch new file mode 100644 index 000000000..b56a37cb8 --- /dev/null +++ b/extra/freeglut/glut-cursor-inherit.patch @@ -0,0 +1,23 @@ +--- freeglut-2.4.0.orig/src/freeglut_cursor.c ++++ freeglut-2.4.0/src/freeglut_cursor.c +@@ -130,7 +130,9 @@ + XCreateFontCursor( fgDisplay.Display, entry->cursorShape ); + } + cursor = entry->cachedCursor; +- } else { ++ if (cursor == None) ++ fgError( "Failed to create cursor" ); ++ } else { + switch( cursorIDToUse ) + { + case GLUT_CURSOR_NONE: +@@ -147,9 +149,6 @@ + } + } + +- if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) ) { +- fgError( "Failed to create cursor" ); +- } + XDefineCursor( fgDisplay.Display, + window->Window.Handle, cursor ); + } |