X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..23b1018f14b8cbdd19e29931b0ccdba46eac2f1f:/src/common/appbase.cpp

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 061b93b815..f1610067c4 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -6,7 +6,7 @@
 // Created:     19.06.2003 (extracted from common/appcmn.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWidgets license
+// License:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -28,9 +28,7 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/list.h"
-    #if wxUSE_LOG
-        #include "wx/log.h"
-    #endif // wxUSE_LOG
+    #include "wx/log.h"
 #endif //WX_PRECOMP
 
 #include "wx/utils.h"
@@ -130,15 +128,25 @@ wxAppConsole::~wxAppConsole()
 
 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;
 
+#ifndef __WXPALMOS__
     if ( m_appName.empty() && argv )
     {
         // the application name is, by default, the name of its executable file
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);
     }
+#endif
 
     return true;
 }
@@ -159,7 +167,7 @@ bool wxAppConsole::OnInit()
     OnInitCmdLine(parser);
 
     bool cont;
-    switch ( parser.Parse(FALSE /* don't show usage */) )
+    switch ( parser.Parse(false /* don't show usage */) )
     {
         case -1:
             cont = OnCmdLineHelp(parser);
@@ -175,10 +183,10 @@ bool wxAppConsole::OnInit()
     }
 
     if ( !cont )
-        return FALSE;
+        return false;
 #endif // wxUSE_CMDLINE_PARSER
 
-    return TRUE;
+    return true;
 }
 
 int wxAppConsole::OnExit()
@@ -337,7 +345,7 @@ void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser)
 #if wxUSE_LOG
         {
             wxCMD_LINE_SWITCH,
-            _T(""),
+            wxEmptyString,
             OPTION_VERBOSE,
             gettext_noop("generate verbose log messages"),
             wxCMD_LINE_VAL_NONE,
@@ -348,9 +356,9 @@ void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser)
         // terminator
         {
             wxCMD_LINE_NONE,
-            _T(""),
-            _T(""),
-            _T(""),
+            wxEmptyString,
+            wxEmptyString,
+            wxEmptyString,
             wxCMD_LINE_VAL_NONE,
             0x0
         }
@@ -364,25 +372,27 @@ bool wxAppConsole::OnCmdLineParsed(wxCmdLineParser& parser)
 #if wxUSE_LOG
     if ( parser.Found(OPTION_VERBOSE) )
     {
-        wxLog::SetVerbose(TRUE);
+        wxLog::SetVerbose(true);
     }
+#else
+    wxUnusedVar(parser);
 #endif // wxUSE_LOG
 
-    return TRUE;
+    return true;
 }
 
 bool wxAppConsole::OnCmdLineHelp(wxCmdLineParser& parser)
 {
     parser.Usage();
 
-    return FALSE;
+    return false;
 }
 
 bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser)
 {
     parser.Usage();
 
-    return FALSE;
+    return false;
 }
 
 #endif // wxUSE_CMDLINE_PARSER
@@ -413,11 +423,11 @@ bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
         wxLogFatalError(msg.c_str());
 
         // normally wxLogFatalError doesn't return
-        return FALSE;
+        return false;
     }
 #undef wxCMP
 
-    return TRUE;
+    return true;
 }
 
 #ifdef __WXDEBUG__
@@ -432,6 +442,15 @@ void wxAppConsole::OnAssert(const wxChar *file,
 
 #endif // __WXDEBUG__
 
+#if WXWIN_COMPATIBILITY_2_4
+
+bool wxAppConsole::CheckBuildOptions(const wxBuildOptions& buildOptions)
+{
+    return CheckBuildOptions(buildOptions.m_signature, "your program");
+}
+
+#endif
+
 // ============================================================================
 // other classes implementations
 // ============================================================================
@@ -581,19 +600,19 @@ void wxOnAssert(const wxChar *szFile,
                 const wxChar *szMsg)
 {
     // FIXME MT-unsafe
-    static bool s_bInAssert = FALSE;
+    static bool s_bInAssert = false;
 
     if ( s_bInAssert )
     {
         // He-e-e-e-elp!! we're trapped in endless loop
         wxTrap();
 
-        s_bInAssert = FALSE;
+        s_bInAssert = false;
 
         return;
     }
 
-    s_bInAssert = TRUE;
+    s_bInAssert = true;
 
     if ( !wxTheApp )
     {
@@ -607,7 +626,7 @@ void wxOnAssert(const wxChar *szFile,
         wxTheApp->OnAssert(szFile, nLine, szCond, szMsg);
     }
 
-    s_bInAssert = FALSE;
+    s_bInAssert = false;
 }
 
 #endif // __WXDEBUG__
@@ -677,7 +696,7 @@ void ShowAssertDialog(const wxChar *szFile,
                       wxAppTraits *traits)
 {
     // this variable can be set to true to suppress "assert failure" messages
-    static bool s_bNoAsserts = FALSE;
+    static bool s_bNoAsserts = false;
 
     wxString msg;
     msg.reserve(2048);