From: <joe...@us...> - 2006-09-21 19:21:46
|
Revision: 702 http://svn.sourceforge.net/freeglut/?rev=702&view=rev Author: joekrahn Date: 2006-09-21 12:20:17 -0700 (Thu, 21 Sep 2006) Log Message: ----------- test (comment edited) Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_cursor.c Modified: trunk/freeglut/freeglut/src/freeglut_cursor.c =================================================================== --- trunk/freeglut/freeglut/src/freeglut_cursor.c 2006-09-21 19:02:14 UTC (rev 701) +++ trunk/freeglut/freeglut/src/freeglut_cursor.c 2006-09-21 19:20:17 UTC (rev 702) @@ -159,7 +159,7 @@ #elif TARGET_HOST_MS_WINDOWS /* - * This is a temporary solution only... + * Joe Krahn is re-writing the following code. */ /* Set the cursor AND change it for this window class. */ # define MAP_CURSOR(a,b) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2007-09-25 23:09:34
|
Revision: 729 http://freeglut.svn.sourceforge.net/freeglut/?rev=729&view=rev Author: fayjf Date: 2007-09-25 16:09:29 -0700 (Tue, 25 Sep 2007) Log Message: ----------- Changing the cursor definition macro for newer versions of MSVC -- thanks to "Mattos" of Brazil Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_cursor.c Modified: trunk/freeglut/freeglut/src/freeglut_cursor.c =================================================================== --- trunk/freeglut/freeglut/src/freeglut_cursor.c 2007-09-25 03:54:56 UTC (rev 728) +++ trunk/freeglut/freeglut/src/freeglut_cursor.c 2007-09-25 23:09:29 UTC (rev 729) @@ -162,6 +162,7 @@ * Joe Krahn is re-writing the following code. */ /* Set the cursor AND change it for this window class. */ +#if _MSC_VER <= 1200 # define MAP_CURSOR(a,b) \ case a: \ SetCursor( LoadCursor( NULL, b ) ); \ @@ -169,7 +170,6 @@ GCL_HCURSOR, \ ( LONG )LoadCursor( NULL, b ) ); \ break; - /* Nuke the cursor AND change it for this window class. */ # define ZAP_CURSOR(a,b) \ case a: \ @@ -177,6 +177,22 @@ SetClassLong( window->Window.Handle, \ GCL_HCURSOR, ( LONG )NULL ); \ break; +#else +# define MAP_CURSOR(a,b) \ + case a: \ + SetCursor( LoadCursor( NULL, b ) ); \ + SetClassLongPtr( window->Window.Handle, \ + GCLP_HCURSOR, \ + ( LONG )LoadCursor( NULL, b ) ); \ + break; + /* Nuke the cursor AND change it for this window class. */ +# define ZAP_CURSOR(a,b) \ + case a: \ + SetCursor( NULL ); \ + SetClassLong( window->Window.Handle, \ + GCLP_HCURSOR, ( LONG )NULL ); \ + break; +#endif switch( cursorID ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2007-09-29 13:06:35
|
Revision: 730 http://freeglut.svn.sourceforge.net/freeglut/?rev=730&view=rev Author: fayjf Date: 2007-09-29 06:06:38 -0700 (Sat, 29 Sep 2007) Log Message: ----------- Removing the remaining compiler warnings from the cursor code, thanks to Antonio Mattos of Brazil. The double type-casting is needed because of a bug in the new MSVC; there is a discussion on the web on this subject. Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_cursor.c Modified: trunk/freeglut/freeglut/src/freeglut_cursor.c =================================================================== --- trunk/freeglut/freeglut/src/freeglut_cursor.c 2007-09-25 23:09:29 UTC (rev 729) +++ trunk/freeglut/freeglut/src/freeglut_cursor.c 2007-09-29 13:06:38 UTC (rev 730) @@ -183,14 +183,14 @@ SetCursor( LoadCursor( NULL, b ) ); \ SetClassLongPtr( window->Window.Handle, \ GCLP_HCURSOR, \ - ( LONG )LoadCursor( NULL, b ) ); \ + ( LONG )( LONG_PTR )LoadCursor( NULL, b ) ); \ break; /* Nuke the cursor AND change it for this window class. */ # define ZAP_CURSOR(a,b) \ case a: \ SetCursor( NULL ); \ - SetClassLong( window->Window.Handle, \ - GCLP_HCURSOR, ( LONG )NULL ); \ + SetClassLongPtr( window->Window.Handle, \ + GCLP_HCURSOR, ( LONG )( LONG_PTR )NULL ); \ break; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |