extracted Unix code in a separate new file (src/unix/dlunix.cpp), it remains only...

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index d15e4a5d415e8dc55bc86e2abfddd8a6c3b549c1..8d3f6b21108bbd2bac82e74e67644196018ba7fe 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -128,21 +128,25 @@ 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);
     // 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;
 

+#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);
     }
     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;
 }
 
     return true;
 }


@@ -163,7 +167,7 @@ bool wxAppConsole::OnInit()
     OnInitCmdLine(parser);
 
     bool cont;
     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);
     {
         case -1:
             cont = OnCmdLineHelp(parser);


@@ -179,10 +183,10 @@ bool wxAppConsole::OnInit()
     }
 
     if ( !cont )
     }
 
     if ( !cont )

-        return FALSE;
+        return false;

 #endif // wxUSE_CMDLINE_PARSER
 
 #endif // wxUSE_CMDLINE_PARSER
 

-    return TRUE;
+    return true;

 }
 
 int wxAppConsole::OnExit()
 }
 
 int wxAppConsole::OnExit()


@@ -368,25 +372,27 @@ bool wxAppConsole::OnCmdLineParsed(wxCmdLineParser& parser)
 #if wxUSE_LOG
     if ( parser.Found(OPTION_VERBOSE) )
     {
 #if wxUSE_LOG
     if ( parser.Found(OPTION_VERBOSE) )
     {

-        wxLog::SetVerbose(TRUE);
+        wxLog::SetVerbose(true);

     }
     }

+#else
+    wxUnusedVar(parser);

 #endif // wxUSE_LOG
 
 #endif // wxUSE_LOG
 

-    return TRUE;
+    return true;

 }
 
 bool wxAppConsole::OnCmdLineHelp(wxCmdLineParser& parser)
 {
     parser.Usage();
 
 }
 
 bool wxAppConsole::OnCmdLineHelp(wxCmdLineParser& parser)
 {
     parser.Usage();
 

-    return FALSE;
+    return false;

 }
 
 bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser)
 {
     parser.Usage();
 
 }
 
 bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser)
 {
     parser.Usage();
 

-    return FALSE;
+    return false;

 }
 
 #endif // wxUSE_CMDLINE_PARSER
 }
 
 #endif // wxUSE_CMDLINE_PARSER


@@ -417,11 +423,11 @@ bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
         wxLogFatalError(msg.c_str());
 
         // normally wxLogFatalError doesn't return
         wxLogFatalError(msg.c_str());
 
         // normally wxLogFatalError doesn't return

-        return FALSE;
+        return false;

     }
 #undef wxCMP
 
     }
 #undef wxCMP
 

-    return TRUE;
+    return true;

 }
 
 #ifdef __WXDEBUG__
 }
 
 #ifdef __WXDEBUG__


@@ -436,6 +442,15 @@ void wxAppConsole::OnAssert(const wxChar *file,
 
 #endif // __WXDEBUG__
 
 
 #endif // __WXDEBUG__
 

+#if WXWIN_COMPATIBILITY_2_4
+
+bool wxAppConsole::CheckBuildOptions(const wxBuildOptions& buildOptions)
+{
+    return CheckBuildOptions(buildOptions.m_signature, "your program");
+}
+
+#endif
+

 // ============================================================================
 // other classes implementations
 // ============================================================================
 // ============================================================================
 // other classes implementations
 // ============================================================================


@@ -585,19 +600,19 @@ void wxOnAssert(const wxChar *szFile,
                 const wxChar *szMsg)
 {
     // FIXME MT-unsafe
                 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();
 
 
     if ( s_bInAssert )
     {
         // He-e-e-e-elp!! we're trapped in endless loop
         wxTrap();
 

-        s_bInAssert = FALSE;
+        s_bInAssert = false;

 
         return;
     }
 
 
         return;
     }
 

-    s_bInAssert = TRUE;
+    s_bInAssert = true;

 
     if ( !wxTheApp )
     {
 
     if ( !wxTheApp )
     {


@@ -611,7 +626,7 @@ void wxOnAssert(const wxChar *szFile,
         wxTheApp->OnAssert(szFile, nLine, szCond, szMsg);
     }
 
         wxTheApp->OnAssert(szFile, nLine, szCond, szMsg);
     }
 

-    s_bInAssert = FALSE;
+    s_bInAssert = false;

 }
 
 #endif // __WXDEBUG__
 }
 
 #endif // __WXDEBUG__


@@ -681,7 +696,7 @@ void ShowAssertDialog(const wxChar *szFile,
                       wxAppTraits *traits)
 {
     // this variable can be set to true to suppress "assert failure" messages
                       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);
 
     wxString msg;
     msg.reserve(2048);