General ChangeLog Updates

[freeglut] / src / freeglut_main.c

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index d5e34fc..c7027f8 100644 (file)
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -402,6 +402,7 @@ static void fghCheckJoystickCallback( SFG_Window* w, SFG_Enumerator* e)
 static int fghHaveJoystick( void )
 {
     SFG_Enumerator enumerator;
+
     enumerator.found = GL_FALSE;
     enumerator.data = NULL;
     fgEnumWindows( fghCheckJoystickCallback, &enumerator );
@@ -419,6 +420,7 @@ static void fghHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e)
 static int fghHavePendingRedisplays (void)
 {
     SFG_Enumerator enumerator;
+
     enumerator.found = GL_FALSE;
     enumerator.data = NULL;
     fgEnumWindows( fghHavePendingRedisplaysCallback, &enumerator );
@@ -527,7 +529,7 @@ void FGAPIENTRY glutMainLoopEvent( void )
     window->State.MouseX = event.a.x;            \
     window->State.MouseY = event.a.y;
 
-    freeglut_assert_ready;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMainLoopEvent" );
 
     while( XPending( fgDisplay.Display ) )
     {
@@ -1040,6 +1042,8 @@ void FGAPIENTRY glutMainLoopEvent( void )
 
     MSG stMsg;
 
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMainLoopEvent" );
+
     while( PeekMessage( &stMsg, NULL, 0, 0, PM_NOREMOVE ) )
     {
         if( GetMessage( &stMsg, NULL, 0, 0 ) == 0 )
@@ -1080,7 +1084,7 @@ void FGAPIENTRY glutMainLoop( void )
     SFG_Window *window = (SFG_Window *)fgStructure.Windows.First ;
 #endif
 
-    freeglut_assert_ready;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMainLoop" );
 
 #if TARGET_HOST_WIN32 || TARGET_HOST_WINCE
     /*
@@ -1150,6 +1154,7 @@ void FGAPIENTRY glutMainLoop( void )
  */
 void FGAPIENTRY glutLeaveMainLoop( void )
 {
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutLeaveMainLoop" );
     fgState.ExecState = GLUT_EXEC_STATE_STOP ;
 }
 
@@ -1175,10 +1180,14 @@ static int fghGetWin32Modifiers (void)
 LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
                                LPARAM lParam )
 {
-    SFG_Window* window = fgWindowByHandle( hWnd );
+    SFG_Window* window;
     PAINTSTRUCT ps;
     LONG lRet = 1;
 
+    FREEGLUT_INTERNAL_ERROR_EXIT_IF_NOT_INITIALISED ( "Event Handler" ) ;
+
+    window = fgWindowByHandle( hWnd );
+
     if ( ( window == NULL ) && ( uMsg != WM_CREATE ) )
       return DefWindowProc( hWnd, uMsg, wParam, lParam );
 
@@ -1189,7 +1198,8 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
     case WM_CREATE:
         /* The window structure is passed as the creation structure paramter... */
         window = (SFG_Window *) (((LPCREATESTRUCT) lParam)->lpCreateParams);
-        assert( window != NULL );
+        FREEGLUT_INTERNAL_ERROR_EXIT ( ( window != NULL ), "Cannot create window",
+                                       "fgWindowProc" );
 
         window->Window.Handle = hWnd;
         window->Window.Device = GetDC( hWnd );