Applied patch [ 1380544 ] wxCondition::WaitTimeout() return value when timeout occurs

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 0f2c5edd343fa362941961bfa76a62423d8aa7dc..fd408ab0d95aee5ac8c709687e25a03a0d68aa69 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -57,22 +57,29 @@
 #endif
 
 #if defined(__WXMAC__)
 #endif
 
 #if defined(__WXMAC__)

-    // VZ: MacTypes.h is enough under Mac OS X (where I could test it) but
-    //     I don't know which headers are needed under earlier systems so
-    //     include everything when in doubt

     #ifdef __DARWIN__
     #ifdef __DARWIN__

-        #include  "MacTypes.h"
+        #include  <CoreServices/CoreServices.h>

     #else
         #include  "wx/mac/private.h"  // includes mac headers
     #endif
 #endif // __WXMAC__
 
 #ifdef __WXDEBUG__
     #else
         #include  "wx/mac/private.h"  // includes mac headers
     #endif
 #endif // __WXMAC__
 
 #ifdef __WXDEBUG__

-    #ifdef wxUSE_STACKWALKER
+    #if wxUSE_STACKWALKER

         #include "wx/stackwalk.h"
         #include "wx/stackwalk.h"

+        #ifdef __WXMSW__
+            #include "wx/msw/debughlp.h"
+        #endif

     #endif // wxUSE_STACKWALKER
 #endif // __WXDEBUG__
 
     #endif // wxUSE_STACKWALKER
 #endif // __WXDEBUG__
 

+// wxABI_VERSION can be defined when compiling applications but it should be
+// left undefined when compiling the library itself, it is then set to its
+// default value in version.h
+#if wxABI_VERSION != wxMAJOR_VERSION * 10000 + wxMINOR_VERSION * 100 + 99
+#error "wxABI_VERSION should not be defined when compiling the library"
+#endif
+

 // ----------------------------------------------------------------------------
 // private functions prototypes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions prototypes
 // ----------------------------------------------------------------------------


@@ -137,19 +144,11 @@ wxAppConsole::~wxAppConsole()
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 

-bool wxAppConsole::Initialize(int& argc, wxChar **argv)
+bool wxAppConsole::Initialize(int& argcOrig, wxChar **argvOrig)

 {
 {

-#if wxUSE_LOG
-    // If some code logged something before wxApp instance was created,
-    // wxLogStderr was set as the target. Undo it here by destroying the
-    // current target. It will be re-created next time logging is needed, but
-    // this time wxAppTraits will be used:
-    delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
-

     // remember the command line arguments
     // remember the command line arguments

-    this->argc = argc;
-    this->argv = argv;
+    argc = argcOrig;
+    argv = argvOrig;

 
 #ifndef __WXPALMOS__
     if ( m_appName.empty() && argv )
 
 #ifndef __WXPALMOS__
     if ( m_appName.empty() && argv )


@@ -208,10 +207,6 @@ int wxAppConsole::OnExit()
     delete wxConfigBase::Set((wxConfigBase *) NULL);
 #endif // wxUSE_CONFIG
 
     delete wxConfigBase::Set((wxConfigBase *) NULL);
 #endif // wxUSE_CONFIG
 

-    // use Set(NULL) and not Get() to avoid creating a message output object on
-    // demand when we just want to delete it
-    delete wxMessageOutput::Set(NULL);
-

     return 0;
 }
 
     return 0;
 }
 


@@ -269,6 +264,11 @@ wxMessageOutput *wxAppConsole::CreateMessageOutput()
 
 void wxAppConsole::ProcessPendingEvents()
 {
 
 void wxAppConsole::ProcessPendingEvents()
 {

+#if wxUSE_THREADS
+    if ( !wxPendingEventsLocker )
+        return;
+#endif
+    

     // ensure that we're the only thread to modify the pending events list
     wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 
     // ensure that we're the only thread to modify the pending events list
     wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 


@@ -288,7 +288,9 @@ void wxAppConsole::ProcessPendingEvents()
         // In ProcessPendingEvents(), new handlers might be add
         // and we can safely leave the critical section here.
         wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
         // In ProcessPendingEvents(), new handlers might be add
         // and we can safely leave the critical section here.
         wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );

+        

         handler->ProcessPendingEvents();
         handler->ProcessPendingEvents();

+

         wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 
         node = wxPendingEvents->GetFirst();
         wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 
         node = wxPendingEvents->GetFirst();


@@ -318,17 +320,6 @@ wxAppConsole::HandleEvent(wxEvtHandler *handler,
     (handler->*func)(event);
 }
 
     (handler->*func)(event);
 }
 

-bool
-wxAppConsole::OnExceptionInMainLoop()
-{
-    throw;
-
-    // some compilers are too stupid to know that we never return after throw
-#if defined(__DMC__) || (defined(_MSC_VER) && _MSC_VER < 1200)
-    return false;
-#endif
-}
-

 #endif // wxUSE_EXCEPTIONS
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_EXCEPTIONS
 
 // ----------------------------------------------------------------------------


@@ -700,35 +691,11 @@ bool DoShowAssertDialog(const wxString& msg)
     return false;
 }
 
     return false;
 }
 

-// show the assert modal dialog
-static
-void ShowAssertDialog(const wxChar *szFile,
-                      int nLine,
-                      const wxChar *szCond,
-                      const wxChar *szMsg,
-                      wxAppTraits *traits)
+#if wxUSE_STACKWALKER
+static wxString GetAssertStackTrace()

 {
 {

-    // this variable can be set to true to suppress "assert failure" messages
-    static bool s_bNoAsserts = false;
-
-    wxString msg;
-    msg.reserve(2048);
+    wxString stackTrace;

 
 

-    // make life easier for people using VC++ IDE by using this format: like
-    // this, clicking on the message will take us immediately to the place of
-    // the failed assert
-    msg.Printf(wxT("%s(%d): assert \"%s\" failed"), szFile, nLine, szCond);
-
-    if ( szMsg )
-    {
-        msg << _T(": ") << szMsg;
-    }
-    else // no message given
-    {
-        msg << _T('.');
-    }
-
-#if wxUSE_STACKWALKER

     class StackDump : public wxStackWalker
     {
     public:
     class StackDump : public wxStackWalker
     {
     public:


@@ -739,7 +706,11 @@ void ShowAssertDialog(const wxChar *szFile,
     protected:
         virtual void OnStackFrame(const wxStackFrame& frame)
         {
     protected:
         virtual void OnStackFrame(const wxStackFrame& frame)
         {

-            m_stackTrace << wxString::Format(_T("[%02d] "), frame.GetLevel());
+            m_stackTrace << wxString::Format
+                            (
+                              _T("[%02d] "),
+                              wx_truncate_cast(int, frame.GetLevel())
+                            );

 
             wxString name = frame.GetName();
             if ( !name.empty() )
 
             wxString name = frame.GetName();
             if ( !name.empty() )


@@ -748,11 +719,7 @@ void ShowAssertDialog(const wxChar *szFile,
             }
             else
             {
             }
             else
             {

-                m_stackTrace << wxString::Format
-                                (
-                                    _T("0x%08lx"),
-                                    (unsigned long)frame.GetAddress()
-                                );
+                m_stackTrace << wxString::Format(_T("%p"), frame.GetAddress());

             }
 
             if ( frame.HasSourceLocation() )
             }
 
             if ( frame.HasSourceLocation() )


@@ -772,21 +739,53 @@ void ShowAssertDialog(const wxChar *szFile,
 
     StackDump dump;
     dump.Walk(5); // don't show OnAssert() call itself
 
     StackDump dump;
     dump.Walk(5); // don't show OnAssert() call itself

-    wxString stackTrace = dump.GetStackTrace();
+    stackTrace = dump.GetStackTrace();
+
+    // don't show more than maxLines or we could get a dialog too tall to be
+    // shown on screen: 20 should be ok everywhere as even with 15 pixel high
+    // characters it is still only 300 pixels...
+    static const int maxLines = 20;
+    const int count = stackTrace.Freq(wxT('\n'));
+    for ( int i = 0; i < count - maxLines; i++ )
+        stackTrace = stackTrace.BeforeLast(wxT('\n'));
+
+    return stackTrace;
+}
+#endif // wxUSE_STACKWALKER

 
 

-    const int maxLines = 10;
-    // Don't show more than maxLines or we could get an enormous dialog
-    int count = stackTrace.Freq(wxT('\n'));
-    if (count > maxLines)
+// show the assert modal dialog
+static
+void ShowAssertDialog(const wxChar *szFile,
+                      int nLine,
+                      const wxChar *szCond,
+                      const wxChar *szMsg,
+                      wxAppTraits *traits)
+{
+    // this variable can be set to true to suppress "assert failure" messages
+    static bool s_bNoAsserts = false;
+
+    wxString msg;
+    msg.reserve(2048);
+
+    // make life easier for people using VC++ IDE by using this format: like
+    // this, clicking on the message will take us immediately to the place of
+    // the failed assert
+    msg.Printf(wxT("%s(%d): assert \"%s\" failed"), szFile, nLine, szCond);
+
+    if ( szMsg )

     {
     {

-        int i;
-        for (i = 0; i < count - maxLines; i++)
-            stackTrace = stackTrace.BeforeLast(wxT('\n'));
+        msg << _T(": ") << szMsg;

     }
     }

+    else // no message given
+    {
+        msg << _T('.');
+    }
+
+#if wxUSE_STACKWALKER
+    const wxString stackTrace = GetAssertStackTrace();

     if ( !stackTrace.empty() )
     {
     if ( !stackTrace.empty() )
     {

-        msg << _T("\n\nCall stack:\n")
-            << stackTrace;
+        msg << _T("\n\nCall stack:\n") << stackTrace;

     }
 #endif // wxUSE_STACKWALKER
 
     }
 #endif // wxUSE_STACKWALKER