X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_menu.c;h=2fc528be19f428f9d1571893b37cd2c5082d47d1;hb=cde0b098d4546af31d3eed3a473c9a975fb960e0;hp=7ad06ba6cb286540fac693fd0ad1054fd10eb3ee;hpb=3e5e3f51c272a95dc877b781281880061690b935;p=freeglut diff --git a/src/Common/freeglut_menu.c b/src/Common/freeglut_menu.c index 7ad06ba..2fc528b 100644 --- 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 */ #if TARGET_HOST_POSIX_X11 -static GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ) +GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ) { int wx, wy; Window w; XTranslateCoordinates( - fgDisplay.Display, + fgDisplay.pDisplay.Display, window->Window.Handle, - fgDisplay.RootWindow, + fgDisplay.pDisplay.RootWindow, 0, 0, &wx, &wy, &w); *x = fgState.GameModeSize.X + wx; @@ -783,14 +783,6 @@ int FGAPIENTRY glutCreateMenu( void(* callback)( int ) ) return fgCreateMenu( callback )->ID; } -#if TARGET_HOST_MS_WINDOWS -int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exit_function)(int) ) -{ - __glutExitFunc = exit_function; - return glutCreateMenu( callback ); -} -#endif - /* * Destroys a menu object, removing all references to it */