X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f54043c214e8e79de9176be079731ecad3c6232a..86948c99a6f0fd177b09b3db0ef702739ec62a27:/src/common/appbase.cpp

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 118feac7ad..5a6a35127e 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -57,22 +57,29 @@
 #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__
-        #include  "MacTypes.h"
+        #include  <CoreServices/CoreServices.h>
     #else
         #include  "wx/mac/private.h"  // includes mac headers
     #endif
 #endif // __WXMAC__
 
 #ifdef __WXDEBUG__
-    #ifdef wxUSE_STACKWALKER
+    #if wxUSE_STACKWALKER
         #include "wx/stackwalk.h"
+        #ifdef __WXMSW__
+            #include "wx/msw/debughlp.h"
+        #endif
     #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
 // ----------------------------------------------------------------------------
@@ -86,6 +93,7 @@
     static
     void ShowAssertDialog(const wxChar *szFile,
                           int nLine,
+                          const wxChar *szFunc,
                           const wxChar *szCond,
                           const wxChar *szMsg,
                           wxAppTraits *traits = NULL);
@@ -137,19 +145,11 @@ wxAppConsole::~wxAppConsole()
 // 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
-    this->argc = argc;
-    this->argv = argv;
+    argc = argcOrig;
+    argv = argvOrig;
 
 #ifndef __WXPALMOS__
     if ( m_appName.empty() && argv )
@@ -208,10 +208,6 @@ int wxAppConsole::OnExit()
     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;
 }
 
@@ -269,8 +265,10 @@ wxMessageOutput *wxAppConsole::CreateMessageOutput()
 
 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 );
@@ -291,7 +289,9 @@ void wxAppConsole::ProcessPendingEvents()
         // In ProcessPendingEvents(), new handlers might be add
         // and we can safely leave the critical section here.
         wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+        
         handler->ProcessPendingEvents();
+
         wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 
         node = wxPendingEvents->GetFirst();
@@ -321,17 +321,6 @@ wxAppConsole::HandleEvent(wxEvtHandler *handler,
     (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
 
 // ----------------------------------------------------------------------------
@@ -446,12 +435,21 @@ bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
 
 #ifdef __WXDEBUG__
 
+void wxAppConsole::OnAssertFailure(const wxChar *file,
+                                   int line,
+                                   const wxChar *func,
+                                   const wxChar *cond,
+                                   const wxChar *msg)
+{
+    ShowAssertDialog(file, line, func, cond, msg, GetTraits());
+}
+
 void wxAppConsole::OnAssert(const wxChar *file,
                             int line,
                             const wxChar *cond,
                             const wxChar *msg)
 {
-    ShowAssertDialog(file, line, cond, msg, GetTraits());
+    OnAssertFailure(file, line, NULL, cond, msg);
 }
 
 #endif // __WXDEBUG__
@@ -599,19 +597,10 @@ void wxTrap()
 #endif // Win/Unix
 }
 
-void wxAssert(int cond,
-              const wxChar *szFile,
-              int nLine,
-              const wxChar *szCond,
-              const wxChar *szMsg)
-{
-    if ( !cond )
-        wxOnAssert(szFile, nLine, szCond, szMsg);
-}
-
 // this function is called when an assert fails
 void wxOnAssert(const wxChar *szFile,
                 int nLine,
+                const char *szFunc,
                 const wxChar *szCond,
                 const wxChar *szMsg)
 {
@@ -630,16 +619,19 @@ void wxOnAssert(const wxChar *szFile,
 
     s_bInAssert = true;
 
+    // __FUNCTION__ is always in ASCII, convert it to wide char if needed
+    const wxString strFunc = wxString::FromAscii(szFunc);
+
     if ( !wxTheApp )
     {
         // by default, show the assert dialog box -- we can't customize this
         // behaviour
-        ShowAssertDialog(szFile, nLine, szCond, szMsg);
+        ShowAssertDialog(szFile, nLine, strFunc, szCond, szMsg);
     }
     else
     {
         // let the app process it as it wants
-        wxTheApp->OnAssert(szFile, nLine, szCond, szMsg);
+        wxTheApp->OnAssertFailure(szFile, nLine, strFunc, szCond, szMsg);
     }
 
     s_bInAssert = false;
@@ -703,35 +695,11 @@ bool DoShowAssertDialog(const wxString& msg)
     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);
-
-    // 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('.');
-    }
+    wxString stackTrace;
 
-#if wxUSE_STACKWALKER
     class StackDump : public wxStackWalker
     {
     public:
@@ -742,7 +710,11 @@ void ShowAssertDialog(const wxChar *szFile,
     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() )
@@ -751,11 +723,7 @@ void ShowAssertDialog(const wxChar *szFile,
             }
             else
             {
-                m_stackTrace << wxString::Format
-                                (
-                                    _T("0x%08lx"),
-                                    (unsigned long)frame.GetAddress()
-                                );
+                m_stackTrace << wxString::Format(_T("%p"), frame.GetAddress());
             }
 
             if ( frame.HasSourceLocation() )
@@ -774,24 +742,60 @@ void ShowAssertDialog(const wxChar *szFile,
     };
 
     StackDump dump;
-    dump.Walk(5); // don't show OnAssert() call itself
-    wxString stackTrace = dump.GetStackTrace();
+    dump.Walk(2); // don't show OnAssert() call itself
+    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...
-    const int maxLines = 20;
-    int count = stackTrace.Freq(wxT('\n'));
-    if (count > maxLines)
+    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
+
+// show the assert modal dialog
+static
+void ShowAssertDialog(const wxChar *szFile,
+                      int nLine,
+                      const wxChar *szFunc,
+                      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);
+
+    // add the function name, if any
+    if ( szFunc && *szFunc )
+        msg << _T(" in ") << szFunc << _T("()");
+
+    // and the message itself
+    if ( szMsg )
+    {
+        msg << _T(": ") << szMsg;
+    }
+    else // no message given
     {
-        int i;
-        for (i = 0; i < count - maxLines; i++)
-            stackTrace = stackTrace.BeforeLast(wxT('\n'));
+        msg << _T('.');
     }
+
+#if wxUSE_STACKWALKER
+    const wxString stackTrace = GetAssertStackTrace();
     if ( !stackTrace.empty() )
     {
-        msg << _T("\n\nCall stack:\n")
-            << stackTrace;
+        msg << _T("\n\nCall stack:\n") << stackTrace;
     }
 #endif // wxUSE_STACKWALKER