Fix a game mode crashing bug, conditional compilation for Windows, and comment out...

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@511 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/freeglut_gamemode.c b/src/freeglut_gamemode.c
index afa0e7a..09e38ab 100644 (file)
--- a/src/freeglut_gamemode.c
+++ b/src/freeglut_gamemode.c
@@ -549,6 +549,8 @@ void FGAPIENTRY glutLeaveGameMode( void )
 
     fgAddToWindowDestroyList( fgStructure.GameMode );
 
+    fgStructure.GameMode = NULL ;
+
 #if TARGET_HOST_UNIX_X11
 
     XUngrabPointer( fgDisplay.Display, CurrentTime );

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index 8c8e1d2..57c1dda 100644 (file)
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -191,7 +191,7 @@ struct tagSFG_XYUse
 typedef struct tagSFG_Time SFG_Time;
 struct tagSFG_Time
 {
-#ifdef WIN32
+#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE
     DWORD Value;
 #else
     struct timeval  Value;

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index 9879ff7..e45ee4d 100644 (file)
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -1321,7 +1321,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
         break;
 #if 0
     case WM_SETFOCUS:
-        printf("WM_SETFOCUS: %p\n", window );
+        /* printf("WM_SETFOCUS: %p\n", window ); */
         lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
         break;
 
@@ -1329,8 +1329,8 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
         if (LOWORD(wParam) != WA_INACTIVE)
         {
             /* glutSetCursor( fgStructure.Window->State.Cursor ); */
-            printf("WM_ACTIVATE: glutSetCursor( %p, %d)\n", window,
-                   window->State.Cursor );
+            /* printf("WM_ACTIVATE: glutSetCursor( %p, %d)\n", window,
+                   window->State.Cursor ); */
             glutSetCursor( window->State.Cursor );
         }