* Small fix in wxHTTP::BuildRequest

[wxWidgets.git] / src / gtk1 / app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index d59cb98dedd0ab050d1a20338d4af8e9c7234977..97ef298d00a10daef029c1e11dfccb63f482bc65 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -690,29 +690,35 @@ int wxEntry( int argc, char *argv[] )
 
     if ( retValue == 0 )
     {
+        /* delete pending toplevel windows (typically a single
+          dialog) so that, if there isn't any left, we don't
+          call OnRun() */
+        wxTheApp->DeletePendingObjects();
+       
         wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
 
         if (wxTheApp->Initialized())
+       {
             retValue = wxTheApp->OnRun();
 
-        wxWindow *topWindow = wxTheApp->GetTopWindow();
-        if (topWindow)
-        {
-            // Forcibly delete the window.
-            if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-                topWindow->IsKindOf(CLASSINFO(wxDialog)) )
-            {
-                topWindow->Close( TRUE );
-                wxTheApp->DeletePendingObjects();
-            }
-            else
+            wxWindow *topWindow = wxTheApp->GetTopWindow();
+            if (topWindow)
             {
-                delete topWindow;
-                wxTheApp->SetTopWindow( (wxWindow*) NULL );
-            }
+                /* Forcibly delete the window. */
+                if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+                    topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+                {
+                    topWindow->Close( TRUE );
+                    wxTheApp->DeletePendingObjects();
+                }
+                else
+                {
+                    delete topWindow;
+                    wxTheApp->SetTopWindow( (wxWindow*) NULL );
+                }
+           }
+            wxTheApp->OnExit();
         }
-
-        wxTheApp->OnExit();
     }
 
     // flush the logged messages if any