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

[freeglut] / src / Common / freeglut_menu.c

diff --git a/src/Common/freeglut_menu.c b/src/Common/freeglut_menu.c
index 91b2b83..4ea31aa 100644 (file)
--- a/src/Common/freeglut_menu.c
+++ b/src/Common/freeglut_menu.c
@@ -85,7 +85,7 @@ static float menu_pen_hback [4] = {1.0f,  1.0f,  1.0f,  1.0f};
 #endif\r
 \r
 \r
-extern GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );\r
+extern GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );\r
 \r
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */\r
 \r
@@ -143,15 +143,15 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry )
  * Private function to get the virtual maximum screen extent\r
  */\r
 #if TARGET_HOST_POSIX_X11\r
-static GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )\r
+GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )\r
 {\r
     int wx, wy;\r
     Window w;\r
 \r
     XTranslateCoordinates(\r
-        fgDisplay.Display,\r
+        fgDisplay.pDisplay.Display,\r
         window->Window.Handle,\r
-        fgDisplay.RootWindow,\r
+        fgDisplay.pDisplay.RootWindow,\r
         0, 0, &wx, &wy, &w);\r
 \r
     *x = fgState.GameModeSize.X + wx;\r
@@ -163,7 +163,7 @@ static GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
 static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )\r
 {\r
     if( fgStructure.GameModeWindow )\r
-               fghGetGameModeVMaxExtent ( window, x, y );\r
+               fgPlatformGetGameModeVMaxExtent ( window, x, y );\r
     else\r
     {\r
         *x = fgDisplay.ScreenWidth;\r