Moving the Windows-specific "__glutCreateMenuWIthExit" function to the Windows-specif...
authorJohn F. Fay <johnffay@nettally.com>
Sun, 29 Jan 2012 13:06:54 +0000 (13:06 +0000)
committerJohn F. Fay <johnffay@nettally.com>
Sun, 29 Jan 2012 13:06:54 +0000 (13:06 +0000)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1027 7f0cb862-5218-0410-a997-914c9d46530a

src/Common/freeglut_menu.c
src/mswin/freeglut_menu_mswin.c

index 4ea31aa..2fc528b 100644 (file)
@@ -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
index 3def1b9..5731cef 100644 (file)
@@ -34,3 +34,15 @@ GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
     *x = glutGet ( GLUT_SCREEN_WIDTH );\r
     *y = glutGet ( GLUT_SCREEN_HEIGHT );\r
 }\r
+\r
+\r
+\r
+/* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */\r
+\r
+\r
+int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exit_function)(int) )\r
+{\r
+  __glutExitFunc = exit_function;\r
+  return glutCreateMenu( callback );\r
+}\r
+\r