Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index c2c7b05bf7ac593cb7e49063394e92a4eeda92b1..0892aab62d0e8724923a18458de698eefa927921 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -68,7 +68,7 @@
 #endif // __WXMAC__
 
 #ifdef __WXDEBUG__
 #endif // __WXMAC__
 
 #ifdef __WXDEBUG__

-    #ifdef wxUSE_STACKWALKER
+    #if wxUSE_STACKWALKER

         #include "wx/stackwalk.h"
         #ifdef __WXMSW__
             #include "wx/msw/debughlp.h"
         #include "wx/stackwalk.h"
         #ifdef __WXMSW__
             #include "wx/msw/debughlp.h"


@@ -142,14 +142,6 @@ wxAppConsole::~wxAppConsole()
 
 bool wxAppConsole::Initialize(int& argc, wxChar **argv)
 {
 
 bool wxAppConsole::Initialize(int& argc, wxChar **argv)
 {

-#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;
     // remember the command line arguments
     this->argc = argc;
     this->argv = argv;


@@ -710,14 +702,17 @@ bool DoShowAssertDialog(const wxString& msg)
     return false;
 }
 
     return false;
 }
 

+#if wxUSE_STACKWALKER

 static wxString GetAssertStackTrace()
 {
     wxString stackTrace;
 
 static wxString GetAssertStackTrace()
 {
     wxString stackTrace;
 

+#if wxUSE_DBGHELP

     // check that we can get the stack trace before trying to do it
     if ( !wxDbgHelpDLL::Init() )
         return stackTrace;
     // check that we can get the stack trace before trying to do it
     if ( !wxDbgHelpDLL::Init() )
         return stackTrace;

-
+#endif
+    

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


@@ -773,6 +768,7 @@ static wxString GetAssertStackTrace()
 
     return stackTrace;
 }
 
     return stackTrace;
 }

+#endif // wxUSE_STACKWALKER

 
 // show the assert modal dialog
 static
 
 // show the assert modal dialog
 static