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 421fff4699f8cb6814eedf8f309f554bc71460ed..d3768ba4a7ee108dd891913217d81a5c72156491 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/appcmn.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/appcmn.cpp

-// Purpose:     wxAppConsole and wxAppBase methods common to all platforms
+// Purpose:     wxAppBase methods common to all platforms

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     18.10.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     18.10.99


@@ -40,16 +40,7 @@
 #include "wx/msgout.h"
 #include "wx/thread.h"
 #include "wx/vidmode.h"
 #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"
 
 #if wxUSE_FONTMAP
     #include "wx/fontmap.h"


@@ -71,7 +62,7 @@ WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
 
 wxAppBase::wxAppBase()
 {
 
 wxAppBase::wxAppBase()
 {

-    m_topWindow = (wxWindow *)NULL;
+    m_topWindow = NULL;

 
     m_useBestVisual = false;
     m_forceTrueColour = false;
 
     m_useBestVisual = false;
     m_forceTrueColour = false;


@@ -102,6 +93,10 @@ bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)
 
     wxBitmap::InitStandardHandlers();
 
 
     wxBitmap::InitStandardHandlers();
 

+    // for compatibility call the old initialization function too
+    if ( !OnInitGui() )
+        return false;
+

     return true;
 }
 
     return true;
 }
 


@@ -138,13 +133,6 @@ void wxAppBase::CleanUp()
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 

-#if wxUSE_THREADS
-    #if wxUSE_VALIDATORS
-        // If we don't do the following, we get an apparent memory leak.
-        ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
-    #endif // wxUSE_VALIDATORS
-#endif // wxUSE_THREADS
-

     wxAppConsole::CleanUp();
 }
 
     wxAppConsole::CleanUp();
 }
 


@@ -189,8 +177,8 @@ wxLayoutDirection wxAppBase::GetLayoutDirection() const
 // GUI-specific command line options handling
 // ----------------------------------------------------------------------------
 
 // GUI-specific command line options handling
 // ----------------------------------------------------------------------------
 

-#define OPTION_THEME   _T("theme")
-#define OPTION_MODE    _T("mode")
+#define OPTION_THEME   "theme"
+#define OPTION_MODE    "mode"

 
 void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 {
 
 void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 {


@@ -203,7 +191,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 #ifdef __WXUNIVERSAL__
         {
             wxCMD_LINE_OPTION,
 #ifdef __WXUNIVERSAL__
         {
             wxCMD_LINE_OPTION,

-            "",
+            NULL,

             OPTION_THEME,
             gettext_noop("specify the theme to use"),
             wxCMD_LINE_VAL_STRING,
             OPTION_THEME,
             gettext_noop("specify the theme to use"),
             wxCMD_LINE_VAL_STRING,


@@ -217,7 +205,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
         //     and not mgl/app.cpp
         {
             wxCMD_LINE_OPTION,
         //     and not mgl/app.cpp
         {
             wxCMD_LINE_OPTION,

-            "",
+            NULL,

             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),
             wxCMD_LINE_VAL_STRING,
             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),
             wxCMD_LINE_VAL_STRING,


@@ -226,14 +214,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 #endif // __WXMGL__
 
         // terminator
 #endif // __WXMGL__
 
         // terminator

-        {
-            wxCMD_LINE_NONE,
-            "",
-            "",
-            "",
-            wxCMD_LINE_VAL_NONE,
-            0x0
-        }
+        wxCMD_LINE_DESC_END

     };
 
     parser.SetDesc(cmdLineGUIDesc);
     };
 
     parser.SetDesc(cmdLineGUIDesc);


@@ -337,6 +318,25 @@ void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
     (void)ProcessEvent(event);
 }
 
     (void)ProcessEvent(event);
 }
 

+bool wxAppBase::SafeYield(wxWindow *win, bool onlyIfNeeded)
+{
+    wxWindowDisabler wd(win);
+
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+
+    return loop && loop->Yield(onlyIfNeeded);
+}
+
+bool wxAppBase::SafeYieldFor(wxWindow *win, long eventsToProcess)
+{
+    wxWindowDisabler wd(win);
+
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+
+    return loop && loop->YieldFor(eventsToProcess);
+}
+
+

 // ----------------------------------------------------------------------------
 // idle handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // idle handling
 // ----------------------------------------------------------------------------


@@ -365,11 +365,11 @@ void wxAppBase::DeletePendingObjects()
 // Returns true if more time is needed.
 bool wxAppBase::ProcessIdle()
 {
 // Returns true if more time is needed.
 bool wxAppBase::ProcessIdle()
 {

-    // process pending wx events before sending idle events
-    ProcessPendingEvents();
-
+    // call the base class version first, it will process the pending events
+    // (which should be done before the idle events generation) and send the
+    // idle event to wxTheApp itself
+    bool needMore = wxAppConsoleBase::ProcessIdle();

     wxIdleEvent event;
     wxIdleEvent event;

-    bool needMore = false;

     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     while (node)
     {
     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     while (node)
     {


@@ -379,9 +379,6 @@ bool wxAppBase::ProcessIdle()
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    if (wxAppConsole::ProcessIdle())
-        needMore = true;
-

     // 'Garbage' collection of windows deleted with Close().
     DeletePendingObjects();
 
     // 'Garbage' collection of windows deleted with Close().
     DeletePendingObjects();
 


@@ -407,7 +404,7 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
             win->HasExtraStyle(wxWS_EX_PROCESS_IDLE) )
     {
         event.SetEventObject(win);
             win->HasExtraStyle(wxWS_EX_PROCESS_IDLE) )
     {
         event.SetEventObject(win);

-        win->GetEventHandler()->ProcessEvent(event);
+        win->HandleWindowEvent(event);

 
         if (event.MoreRequested())
             needMore = true;
 
         if (event.MoreRequested())
             needMore = true;


@@ -433,9 +430,7 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {

-// DE: One day I'll remove this but right now the generic dialog used for this
-// just doesn't work right at all on wxCocoa.
-#if wxUSE_LOGGUI && !defined(__WXCOCOA__)
+#if wxUSE_LOGGUI

     return new wxLogGui;
 #else
     // we must have something!
     return new wxLogGui;
 #else
     // we must have something!


@@ -451,7 +446,8 @@ wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput()
     // is (according to common practice):
     //     - console apps: to stderr (on any platform)
     //     - GUI apps: stderr on Unix platforms (!)
     // is (according to common practice):
     //     - console apps: to stderr (on any platform)
     //     - GUI apps: stderr on Unix platforms (!)

-    //                 message box under Windows and others
+    //                 stderr if available and message box otherwise on others
+    //                 (currently stderr only Windows if app running from console)

 #ifdef __UNIX__
     return new wxMessageOutputStderr;
 #else // !__UNIX__
 #ifdef __UNIX__
     return new wxMessageOutputStderr;
 #else // !__UNIX__


@@ -459,7 +455,7 @@ wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput()
     #ifdef __WXMOTIF__
         return new wxMessageOutputLog;
     #elif wxUSE_MSGDLG
     #ifdef __WXMOTIF__
         return new wxMessageOutputLog;
     #elif wxUSE_MSGDLG

-        return new wxMessageOutputMessageBox;
+        return new wxMessageOutputBest(wxMSGOUT_PREFER_STDERR);

     #else
         return new wxMessageOutputStderr;
     #endif
     #else
         return new wxMessageOutputStderr;
     #endif


@@ -481,16 +477,20 @@ wxRendererNative *wxGUIAppTraitsBase::CreateRenderer()
     return NULL;
 }
 
     return NULL;
 }
 

-#ifdef __WXDEBUG__
-

 bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {
 bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {

-#if defined(__WXMSW__) || !wxUSE_MSGDLG

     // under MSW we prefer to use the base class version using ::MessageBox()
     // even if wxMessageBox() is available because it has less chances to
     // double fault our app than our wxMessageBox()
     // under MSW we prefer to use the base class version using ::MessageBox()
     // even if wxMessageBox() is available because it has less chances to
     // double fault our app than our wxMessageBox()

+    //
+    // under DFB the message dialog is not always functional right now
+    //
+    // and finally we can't use wxMessageBox() if it wasn't compiled in, of
+    // course
+#if defined(__WXMSW__) || defined(__WXDFB__) || !wxUSE_MSGDLG

     return wxAppTraitsBase::ShowAssertDialog(msg);
 #else // wxUSE_MSGDLG
     return wxAppTraitsBase::ShowAssertDialog(msg);
 #else // wxUSE_MSGDLG

+#if wxDEBUG_LEVEL

     wxString msgDlg = msg;
 
 #if wxUSE_STACKWALKER
     wxString msgDlg = msg;
 
 #if wxUSE_STACKWALKER


@@ -523,13 +523,16 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 
         //case wxNO: nothing to do
     }
 
         //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
 }
 
 
     return false;
 #endif // !wxUSE_MSGDLG/wxUSE_MSGDLG
 }
 

-#endif // __WXDEBUG__
-

 bool wxGUIAppTraitsBase::HasStderr()
 {
     // we consider that under Unix stderr always goes somewhere, even if the
 bool wxGUIAppTraitsBase::HasStderr()
 {
     // we consider that under Unix stderr always goes somewhere, even if the


@@ -552,34 +555,3 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
     wxPendingDelete.DeleteObject(object);
 }
 
     wxPendingDelete.DeleteObject(object);
 }
 

-#if wxUSE_SOCKETS
-
-#if defined(__WINDOWS__)
-    #include "wx/msw/gsockmsw.h"
-#elif defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
-    #include "wx/unix/gsockunx.h"
-#elif defined(__WXMAC__)
-    #include <MacHeaders.c>
-    #define OTUNIXERRORS 1
-    #include <OpenTransport.h>
-    #include <OpenTransportProviders.h>
-    #include <OpenTptInternet.h>
-
-    #include "wx/mac/gsockmac.h"
-#else
-    #error "Must include correct GSocket header here"
-#endif
-
-GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
-{
-#if defined(__WXMAC__) && !defined(__DARWIN__)
-    // NB: wxMac CFM does not have any GUI-specific functions in gsocket.c and
-    //     so it doesn't need this table at all
-    return NULL;
-#else // !__WXMAC__ || __DARWIN__
-    static GSocketGUIFunctionsTableConcrete table;
-    return &table;
-#endif // !__WXMAC__ || __DARWIN__
-}
-
-#endif