git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1038...

[freeglut] / src / Common / freeglut_menu.c

diff --git a/src/Common/freeglut_menu.c b/src/Common/freeglut_menu.c
index 7ad06ba..2fc528b 100644 (file)
--- a/src/Common/freeglut_menu.c
+++ b/src/Common/freeglut_menu.c
@@ -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 fgPlatformGetGameModeVMaxExtent( 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
@@ -783,14 +783,6 @@ int FGAPIENTRY glutCreateMenu( void(* callback)( int ) )
     return fgCreateMenu( callback )->ID;\r
 }\r
 \r
-#if TARGET_HOST_MS_WINDOWS\r
-int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exit_function)(int) )\r
-{\r
-  __glutExitFunc = exit_function;\r
-  return glutCreateMenu( callback );\r
-}\r
-#endif\r
-\r
 /*\r
  * Destroys a menu object, removing all references to it\r
  */\r