wxTinderbox build fixes.

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index fe7471e1c7993d91938a105c2df9727b49ea2f82..fd408ab0d95aee5ac8c709687e25a03a0d68aa69 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -207,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;
 }
 


@@ -324,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
 
 // ----------------------------------------------------------------------------


@@ -734,8 +719,7 @@ static wxString GetAssertStackTrace()
             }
             else
             {
             }
             else
             {

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

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