From d38b3eeff0278e5669928742562a27462d7a8e22 Mon Sep 17 00:00:00 2001 From: joekrahn Date: Sat, 23 Sep 2006 03:49:13 +0000 Subject: [PATCH] Removed WindowState.IsGameMode; it is redundant with Structure.GameModeWindow git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@705 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/freeglut_gamemode.c | 4 ---- freeglut/freeglut/src/freeglut_internal.h | 1 - freeglut/freeglut/src/freeglut_main.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/freeglut/freeglut/src/freeglut_gamemode.c b/freeglut/freeglut/src/freeglut_gamemode.c index d466156..a039d7f 100644 --- a/freeglut/freeglut/src/freeglut_gamemode.c +++ b/freeglut/freeglut/src/freeglut_gamemode.c @@ -437,8 +437,6 @@ int FGAPIENTRY glutEnterGameMode( void ) fgStructure.GameModeWindow->State.Height = fgState.GameModeSize.Y; fgStructure.GameModeWindow->State.NeedToResize = GL_TRUE; - fgStructure.GameModeWindow->State.IsGameMode = GL_TRUE; - #if TARGET_HOST_POSIX_X11 /* @@ -541,8 +539,6 @@ void FGAPIENTRY glutLeaveGameMode( void ) freeglut_return_if_fail( fgStructure.GameModeWindow ); - fgStructure.GameModeWindow->State.IsGameMode = GL_FALSE; - fgAddToWindowDestroyList( fgStructure.GameModeWindow ); fgStructure.GameModeWindow = NULL; diff --git a/freeglut/freeglut/src/freeglut_internal.h b/freeglut/freeglut/src/freeglut_internal.h index 572600e..878df4c 100644 --- a/freeglut/freeglut/src/freeglut_internal.h +++ b/freeglut/freeglut/src/freeglut_internal.h @@ -422,7 +422,6 @@ struct tagSFG_WindowState GLboolean IgnoreKeyRepeat; /* Whether to ignore key repeat. */ GLboolean KeyRepeating; /* Currently in repeat mode */ - GLboolean IsGameMode; /* Is this the game mode window? */ GLboolean NeedToResize; /* Do we need to resize the window? */ }; diff --git a/freeglut/freeglut/src/freeglut_main.c b/freeglut/freeglut/src/freeglut_main.c index b4cabb3..e73be9c 100644 --- a/freeglut/freeglut/src/freeglut_main.c +++ b/freeglut/freeglut/src/freeglut_main.c @@ -120,7 +120,7 @@ static void fghReshapeWindow ( SFG_Window *window, int width, int height ) if ( window->Parent == NULL ) { - if ( ! window->IsMenu && !window->State.IsGameMode ) + if ( ! window->IsMenu && (window != fgStructure.GameModeWindow) ) { w += GetSystemMetrics( SM_CXSIZEFRAME ) * 2; h += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 +