X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_menu.c;h=2fc528be19f428f9d1571893b37cd2c5082d47d1;hb=90b777df737006ae0b92acfdd0efc29f7bec136c;hp=45c07c4f6e4d7d279f80161f2fea5c9296d4a75e;hpb=474daf255eabd124b1023c199c3c7b98f242325c;p=freeglut diff --git a/src/Common/freeglut_menu.c b/src/Common/freeglut_menu.c index 45c07c4..2fc528b 100644 --- a/src/Common/freeglut_menu.c +++ b/src/Common/freeglut_menu.c @@ -149,9 +149,9 @@ GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ) 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 */