Fixed crash-on-exit bug due to status bar being deleted twice (MDI apps);

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index cb05b27011235e7e5fd6beb5f5f7921b8d58d48c..95ca2a631dc213c90ebc022bdc0e3a76de017f46 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -126,7 +126,6 @@ extern wxChar *wxOsVersion;
 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;
 extern void wxSetKeyboardHook(bool doIt);
-extern wxCursor *g_globalCursor;
 
 MSG s_currentMsg;
 wxApp *wxTheApp = NULL;
@@ -228,8 +227,6 @@ bool wxApp::Initialize()
     Ctl3dAutoSubclass(wxhInstance);
 #endif
 
-    g_globalCursor = new wxCursor;
-
     // VZ: these icons are not in wx.rc anyhow (but should they?)!
 #if 0
     wxSTD_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_FRAME"));
@@ -497,13 +494,6 @@ void wxApp::CleanUp()
     //  wxDefaultResourceTable->ClearTable();
 #endif
 
-    // Indicate that the cursor can be freed, so that cursor won't be deleted
-    // by deleting the bitmap list before g_globalCursor goes out of scope
-    // (double deletion of the cursor).
-    wxSetCursor(wxNullCursor);
-    delete g_globalCursor;
-    g_globalCursor = NULL;
-
     wxDeleteStockObjects();
 
     // Destroy all GDI lists, etc.
@@ -574,7 +564,7 @@ void wxApp::CleanUp()
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {
-        wxLogDebug(wxT("There were memory leaks."));
+        wxLogMessage(wxT("There were memory leaks."));
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
@@ -587,6 +577,27 @@ void wxApp::CleanUp()
 #endif // wxUSE_LOG
 }
 
+//----------------------------------------------------------------------
+// Entry point helpers, used by wxPython
+//----------------------------------------------------------------------
+
+int  WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char** WXUNUSED(argv) )
+{
+    return wxApp::Initialize();
+}
+
+int  WXDLLEXPORT wxEntryInitGui()
+{
+    wxTheApp->OnInitGui();
+    return 0;
+}
+
+void WXDLLEXPORT wxEntryCleanup()
+{
+    wxApp::CleanUp();
+}
+
+
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 
 // temporarily disable this warning which would be generated in release builds
@@ -595,7 +606,9 @@ void wxApp::CleanUp()
     #pragma warning(disable: 4715) // not all control paths return a value
 #endif // Visual C++
 
-//// Main wxWindows entry point
+//----------------------------------------------------------------------
+// Main wxWindows entry point
+//----------------------------------------------------------------------
 int wxEntry(WXHINSTANCE hInstance,
             WXHINSTANCE WXUNUSED(hPrevInstance),
             char *lpCmdLine,
@@ -630,7 +643,7 @@ int wxEntry(WXHINSTANCE hInstance,
 #endif
         wxhInstance = (HINSTANCE) hInstance;
 
-        if (!wxApp::Initialize())
+        if (!wxEntryStart(0,0))
             return 0;
 
         // create the application object or ensure that one already exists
@@ -653,7 +666,7 @@ int wxEntry(WXHINSTANCE hInstance,
 
         // GUI-specific initialisation. In fact on Windows we don't have any,
         // but this call is provided for compatibility across platforms.
-        wxTheApp->OnInitGui();
+        wxEntryInitGui();
 
         // We really don't want timestamps by default, because it means
         // we can't simply double-click on the error message and get to that
@@ -695,7 +708,7 @@ int wxEntry(WXHINSTANCE hInstance,
 
         wxTheApp->OnExit();
 
-        wxApp::CleanUp();
+        wxEntryCleanup();
 
         return retValue;
 
@@ -728,12 +741,14 @@ int wxEntry(WXHINSTANCE hInstance,
 
 #else /*  _WINDLL  */
 
-//// Entry point for DLLs
+//----------------------------------------------------------------------
+// Entry point for wxWindows + the App in a DLL
+//----------------------------------------------------------------------
 
 int wxEntry(WXHINSTANCE hInstance)
 {
     wxhInstance = (HINSTANCE) hInstance;
-    wxApp::Initialize();
+    wxEntryStart(0, 0);
 
     // The app may have declared a global application object, but we recommend
     // the IMPLEMENT_APP macro is used instead, which sets an initializer function
@@ -751,7 +766,7 @@ int wxEntry(WXHINSTANCE hInstance)
     wxTheApp->argc = 0;
     wxTheApp->argv = NULL;
 
-    wxTheApp->OnInitGui();
+    wxEntryInitGui();
 
     wxTheApp->OnInit();
 
@@ -1005,14 +1020,21 @@ void wxApp::OnIdle(wxIdleEvent& event)
 
     s_inOnIdle = TRUE;
 
+    // If there are pending events, we must process them: pending events
+    // are either events to the threads other than main or events posted
+    // with wxPostEvent() functions
+    // GRG: I have moved this here so that all pending events are processed
+    //   before starting to delete any objects. This behaves better (in
+    //   particular, wrt wxPostEvent) and is coherent with wxGTK's current
+    //   behaviour. Changed Feb/2000 before 2.1.14
+    ProcessPendingEvents();
+
     // 'Garbage' collection of windows deleted with Close().
     DeletePendingObjects();
 
 #if wxUSE_LOG
     // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
+    wxLog::FlushActive();
 #endif // wxUSE_LOG
 
     // Send OnIdle events to all windows
@@ -1023,11 +1045,6 @@ void wxApp::OnIdle(wxIdleEvent& event)
         event.RequestMore(TRUE);
     }
 
-    // If they are pending events, we must process them: pending events are
-    // either events to the threads other than main or events posted with
-    // wxPostEvent() functions
-    ProcessPendingEvents();
-
     s_inOnIdle = FALSE;
 }
 
@@ -1207,14 +1224,18 @@ void wxExit()
     wxLogError(_("Fatal error: exiting"));
 
     wxApp::CleanUp();
+    exit(0);
 }
 
 // Yield to incoming messages
 bool wxYield()
 {
+    // disable log flushing from here because a call to wxYield() shouldn't
+    // normally result in message boxes popping up &c
+    wxLog::Suspend();
+
     // we don't want to process WM_QUIT from here - it should be processed in
     // the main event loop in order to stop it
-
     MSG msg;
     while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) &&
             msg.message != WM_QUIT )
@@ -1228,7 +1249,11 @@ bool wxYield()
     }
 
     // If they are pending events, we must process them.
-    wxTheApp->ProcessPendingEvents();
+    if (wxTheApp)
+        wxTheApp->ProcessPendingEvents();
+
+    // let the logs be flashed again
+    wxLog::Resume();
 
     return TRUE;
 }