VC6 compilation fix for native wxProgressDialog implementation.

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index afbb66008ba9e94d9e5f07253420595b0d3cd947..844aec1f42b31b492d59f8d89a20f0fbe6100398 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"


@@ -59,8 +50,6 @@
 #include "wx/build.h"
 WX_CHECK_BUILD_OPTIONS("wxCore")
 
 #include "wx/build.h"
 WX_CHECK_BUILD_OPTIONS("wxCore")
 

-WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
-

 // ============================================================================
 // wxAppBase implementation
 // ============================================================================
 // ============================================================================
 // wxAppBase implementation
 // ============================================================================


@@ -71,7 +60,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 +91,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;
 }
 


@@ -135,15 +128,7 @@ void wxAppBase::CleanUp()
 
     wxDeleteStockLists();
 
 
     wxDeleteStockLists();
 

-    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
+    wxDELETE(wxTheColourDatabase);

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


@@ -256,7 +241,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
     if ( parser.Found(OPTION_MODE, &modeDesc) )
     {
         unsigned w, h, bpp;
     if ( parser.Found(OPTION_MODE, &modeDesc) )
     {
         unsigned w, h, bpp;

-        if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
+        if ( wxSscanf(modeDesc.c_str(), wxT("%ux%u-%u"), &w, &h, &bpp) != 3 )

         {
             wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
             return false;
         {
             wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
             return false;


@@ -330,39 +315,36 @@ void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
     (void)ProcessEvent(event);
 }
 
     (void)ProcessEvent(event);
 }
 

-// ----------------------------------------------------------------------------
-// idle handling
-// ----------------------------------------------------------------------------
-
-void wxAppBase::DeletePendingObjects()
+bool wxAppBase::SafeYield(wxWindow *win, bool onlyIfNeeded)

 {
 {

-    wxList::compatibility_iterator node = wxPendingDelete.GetFirst();
-    while (node)
-    {
-        wxObject *obj = node->GetData();
+    wxWindowDisabler wd(win);

 
 

-        // remove it from the list first so that if we get back here somehow
-        // during the object deletion (e.g. wxYield called from its dtor) we
-        // wouldn't try to delete it the second time
-        if ( wxPendingDelete.Member(obj) )
-            wxPendingDelete.Erase(node);
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();

 
 

-        delete obj;
+    return loop && loop->Yield(onlyIfNeeded);
+}

 
 

-        // Deleting one object may have deleted other pending
-        // objects, so start from beginning of list again.
-        node = wxPendingDelete.GetFirst();
-    }
+bool wxAppBase::SafeYieldFor(wxWindow *win, long eventsToProcess)
+{
+    wxWindowDisabler wd(win);
+
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+
+    return loop && loop->YieldFor(eventsToProcess);

 }
 
 }
 

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

 // 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 to 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)
     {


@@ -372,17 +354,6 @@ bool wxAppBase::ProcessIdle()
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    if (wxAppConsole::ProcessIdle())
-        needMore = true;
-
-    // 'Garbage' collection of windows deleted with Close().
-    DeletePendingObjects();
-
-#if wxUSE_LOG
-    // flush the logged messages if any
-    wxLog::FlushActive();
-#endif
-

     wxUpdateUIEvent::ResetUpdateTime();
 
     return needMore;
     wxUpdateUIEvent::ResetUpdateTime();
 
     return needMore;


@@ -400,7 +371,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;


@@ -426,10 +397,12 @@ 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
+#ifndef __WXOSX_IPHONE__

     return new wxLogGui;
     return new wxLogGui;

+#else
+    return new wxLogStderr;
+#endif

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


@@ -444,7 +417,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__


@@ -452,7 +426,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


@@ -474,55 +448,59 @@ 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
+#if wxDEBUG_LEVEL

     // 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()

-    return wxAppTraitsBase::ShowAssertDialog(msg);
-#else // wxUSE_MSGDLG
-    wxString msgDlg = msg;
+    //
+    // 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
+
+    // we can't (safely) show the GUI dialog from another thread, only do it
+    // for the asserts in the main thread
+    if ( wxIsMainThread() )
+    {
+        wxString msgDlg = msg;

 
 #if wxUSE_STACKWALKER
 
 #if wxUSE_STACKWALKER

-    // on Unix stack frame generation may take some time, depending on the
-    // size of the executable mainly... warn the user that we are working
-    wxFprintf(stderr, wxT("[Debug] Generating a stack trace... please wait"));
-    fflush(stderr);
-
-    const wxString stackTrace = GetAssertStackTrace();
-    if ( !stackTrace.empty() )
-        msgDlg << _T("\n\nCall stack:\n") << stackTrace;
+        const wxString stackTrace = GetAssertStackTrace();
+        if ( !stackTrace.empty() )
+            msgDlg << wxT("\n\nCall stack:\n") << stackTrace;

 #endif // wxUSE_STACKWALKER
 
 #endif // wxUSE_STACKWALKER
 

-    // this message is intentionally not translated -- it is for
-    // developpers only
-    msgDlg += wxT("\nDo you want to stop the program?\n")
-              wxT("You can also choose [Cancel] to suppress ")
-              wxT("further warnings.");
+        // this message is intentionally not translated -- it is for
+        // developpers only
+        msgDlg += wxT("\nDo you want to stop the program?\n")
+                  wxT("You can also choose [Cancel] to suppress ")
+                  wxT("further warnings.");

 
 

-    switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),
-                          wxYES_NO | wxCANCEL | wxICON_STOP ) )
-    {
-        case wxYES:
-            wxTrap();
-            break;
+        switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),
+                              wxYES_NO | wxCANCEL | wxICON_STOP ) )
+        {
+            case wxYES:
+                wxTrap();
+                break;

 
 

-        case wxCANCEL:
-            // no more asserts
-            return true;
+            case wxCANCEL:
+                // no more asserts
+                return true;
+
+            //case wxNO: nothing to do
+        }

 
 

-        //case wxNO: nothing to do
+        return false;

     }
     }

+#endif // wxUSE_MSGDLG
+#endif // wxDEBUG_LEVEL

 
 

-    return false;
-#endif // !wxUSE_MSGDLG/wxUSE_MSGDLG
+    return wxAppTraitsBase::ShowAssertDialog(msg);

 }
 
 }
 

-#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


@@ -534,45 +512,3 @@ bool wxGUIAppTraitsBase::HasStderr()
 #endif
 }
 
 #endif
 }
 

-void wxGUIAppTraitsBase::ScheduleForDestroy(wxObject *object)
-{
-    if ( !wxPendingDelete.Member(object) )
-        wxPendingDelete.Append(object);
-}
-
-void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *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