if user opens menu in parent window and then clicked child window, the menu wasn...

[freeglut] / src / fg_init.c

diff --git a/src/fg_init.c b/src/fg_init.c
index 68b69ca..752439e 100644 (file)
--- a/src/fg_init.c
+++ b/src/fg_init.c
@@ -102,8 +102,6 @@ extern void fgPlatformInitialize( const char* displayName );
 extern void fgPlatformDeinitialiseInputDevices ( void );
 extern void fgPlatformCloseDisplay ( void );
 extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
-extern void fgInitGL2();
-
 
 void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
 {
@@ -343,9 +341,6 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
 
     fgCreateStructure( );
 
-    /* Get start time */
-    fgState.Time = fgSystemTime();
-
        fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry );
 
     /*
@@ -382,8 +377,6 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
         if( (mask & (XValue|YValue)) == (XValue|YValue) )
             fgState.Position.Use = GL_TRUE;
     }
-
-    fgInitGL2();
 }
 
 /*
@@ -672,19 +665,19 @@ void FGAPIENTRY glutInitContextProfile( int profile )
 /*
  * Sets the user error handler (note the use of va_list for the args to the fmt)
  */
-void FGAPIENTRY glutInitErrorFunc( void (* vfgError) ( const char *fmt, va_list ap ) )
+void FGAPIENTRY glutInitErrorFunc( FGError callback )
 {
     /* This allows user programs to handle freeglut errors */
-    fgState.ErrorFunc = vfgError;
+    fgState.ErrorFunc = callback;
 }
 
 /*
  * Sets the user warning handler (note the use of va_list for the args to the fmt)
  */
-void FGAPIENTRY glutInitWarningFunc( void (* vfgWarning) ( const char *fmt, va_list ap ) )
+void FGAPIENTRY glutInitWarningFunc( FGWarning callback )
 {
     /* This allows user programs to handle freeglut warnings */
-    fgState.WarningFunc = vfgWarning;
+    fgState.WarningFunc = callback;
 }
 
 /*** END OF FILE ***/