Moving platform-specific fields in "SFG_Display" into a substructure

[freeglut] / src / mswin / freeglut_gamemode_mswin.c

diff --git a/src/mswin/freeglut_gamemode_mswin.c b/src/mswin/freeglut_gamemode_mswin.c
index 83acbac..3f23a7b 100644 (file)
--- a/src/mswin/freeglut_gamemode_mswin.c
+++ b/src/mswin/freeglut_gamemode_mswin.c
@@ -41,11 +41,11 @@ void fgPlatformRememberState( void )
 /* hack to get around my stupid cross-gcc headers */\r
 #define FREEGLUT_ENUM_CURRENT_SETTINGS -1\r
 \r
-    EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS,\r
-                         &fgDisplay.DisplayMode );\r
+    EnumDisplaySettings( fgDisplay.pDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS,\r
+                         &fgDisplay.pDisplay.DisplayMode );\r
 \r
     /* Make sure we will be restoring all settings needed */\r
-    fgDisplay.DisplayMode.dmFields |=\r
+    fgDisplay.pDisplay.DisplayMode.dmFields |=\r
         DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY;\r
 \r
 }\r
@@ -56,7 +56,7 @@ void fgPlatformRememberState( void )
 void fgPlatformRestoreState( void )\r
 {\r
     /* Restore the previously remembered desktop display settings */\r
-    ChangeDisplaySettingsEx( fgDisplay.DisplayName,&fgDisplay.DisplayMode, 0,0,0 );\r
+    ChangeDisplaySettingsEx( fgDisplay.pDisplay.DisplayName,&fgDisplay.pDisplay.DisplayMode, 0,0,0 );\r
 \r
 }\r
 \r
@@ -75,7 +75,7 @@ GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest )
 \r
     success = GL_FALSE;\r
 \r
-    EnumDisplaySettings( fgDisplay.DisplayName, -1, &devMode ); \r
+    EnumDisplaySettings( fgDisplay.pDisplay.DisplayName, -1, &devMode ); \r
     devMode.dmFields = 0;\r
 \r
     if (fgState.GameModeSize.X!=-1)\r
@@ -99,7 +99,7 @@ GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest )
         devMode.dmFields |= DM_DISPLAYFREQUENCY;\r
     }\r
 \r
-    switch ( ChangeDisplaySettingsEx(fgDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) )\r
+    switch ( ChangeDisplaySettingsEx(fgDisplay.pDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) )\r
     {\r
     case DISP_CHANGE_SUCCESSFUL:\r
         success = GL_TRUE;\r
@@ -107,7 +107,7 @@ GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest )
         if (!haveToTest)\r
         {\r
             /* update vars in case if windows switched to proper mode */\r
-            EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode );\r
+            EnumDisplaySettings( fgDisplay.pDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode );\r
             fgState.GameModeSize.X  = devMode.dmPelsWidth;        \r
             fgState.GameModeSize.Y  = devMode.dmPelsHeight;\r
             fgState.GameModeDepth   = devMode.dmBitsPerPel;\r