fixing modal dialog quit after nested message box problem

[wxWidgets.git] / src / common / appcmn.cpp

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 95da92def714e2316dd39e54cadf551fb62e35d8..d3768ba4a7ee108dd891913217d81a5c72156491 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -40,16 +40,7 @@
 #include "wx/msgout.h"
 #include "wx/thread.h"
 #include "wx/vidmode.h"
-
-#ifdef __WXDEBUG__
-    #if wxUSE_STACKWALKER
-        #include "wx/stackwalk.h"
-    #endif // wxUSE_STACKWALKER
-#endif // __WXDEBUG__
-
-#if defined(__WXMSW__)
-    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
-#endif
+#include "wx/evtloop.h"
 
 #if wxUSE_FONTMAP
     #include "wx/fontmap.h"
@@ -78,9 +69,6 @@ wxAppBase::wxAppBase()
 
     m_isActive = true;
 
-    m_isInsideYield = false;
-    m_eventsToProcessInsideYield = wxEVT_CATEGORY_ALL;
-
     // We don't want to exit the app if the user code shows a dialog from its
     // OnInit() -- but this is what would happen if we set m_exitOnFrameDelete
     // to Yes initially as this dialog would be the last top level window.
@@ -105,6 +93,10 @@ bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)
 
     wxBitmap::InitStandardHandlers();
 
+    // for compatibility call the old initialization function too
+    if ( !OnInitGui() )
+        return false;
+
     return true;
 }
 
@@ -326,23 +318,22 @@ void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
     (void)ProcessEvent(event);
 }
 
-bool wxAppBase::IsEventAllowedInsideYield(wxEventCategory cat) const
-{
-    return m_eventsToProcessInsideYield & cat;
-}
-
 bool wxAppBase::SafeYield(wxWindow *win, bool onlyIfNeeded)
 {
     wxWindowDisabler wd(win);
 
-    return Yield(onlyIfNeeded);
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+
+    return loop && loop->Yield(onlyIfNeeded);
 }
 
 bool wxAppBase::SafeYieldFor(wxWindow *win, long eventsToProcess)
 {
     wxWindowDisabler wd(win);
 
-    return YieldFor(eventsToProcess);
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+
+    return loop && loop->YieldFor(eventsToProcess);
 }
 
 
@@ -486,8 +477,6 @@ wxRendererNative *wxGUIAppTraitsBase::CreateRenderer()
     return NULL;
 }
 
-#ifdef __WXDEBUG__
-
 bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {
     // under MSW we prefer to use the base class version using ::MessageBox()
@@ -501,6 +490,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 #if defined(__WXMSW__) || defined(__WXDFB__) || !wxUSE_MSGDLG
     return wxAppTraitsBase::ShowAssertDialog(msg);
 #else // wxUSE_MSGDLG
+#if wxDEBUG_LEVEL
     wxString msgDlg = msg;
 
 #if wxUSE_STACKWALKER
@@ -533,13 +523,16 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 
         //case wxNO: nothing to do
     }
+#else // !wxDEBUG_LEVEL
+    // this function always exists (for ABI compatibility) but is never called
+    // if debug level is 0 and so can simply do nothing then
+    wxUnusedVar(msg);
+#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
 
     return false;
 #endif // !wxUSE_MSGDLG/wxUSE_MSGDLG
 }
 
-#endif // __WXDEBUG__
-
 bool wxGUIAppTraitsBase::HasStderr()
 {
     // we consider that under Unix stderr always goes somewhere, even if the