Intel C++ needs time.h before sys/stat.h

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 216d9b86473b74cd393fa97ef90cc16408d7e247..5971f3962be89936ba65cdcd2a4c18853c296d03 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -37,9 +37,7 @@
 #include "wx/apptrait.h"
 #include "wx/cmdline.h"
 #include "wx/confbase.h"
-#if wxUSE_FILENAME
-    #include "wx/filename.h"
-#endif // wxUSE_FILENAME
+#include "wx/filename.h"
 #include "wx/msgout.h"
 #include "wx/tokenzr.h"
 
@@ -91,7 +89,7 @@
 // global vars
 // ----------------------------------------------------------------------------
 
-wxApp *wxTheApp = NULL;
+wxAppConsole *wxAppConsole::ms_appInstance = NULL;
 
 wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL;
 
@@ -107,7 +105,7 @@ wxAppConsole::wxAppConsole()
 {
     m_traits = NULL;
 
-    wxTheApp = (wxApp *)this;
+    ms_appInstance = this;
 
 #ifdef __WXDEBUG__
     SetTraceMasks();
@@ -132,11 +130,7 @@ bool wxAppConsole::Initialize(int& argc, wxChar **argv)
     if ( m_appName.empty() && argv )
     {
         // the application name is, by default, the name of its executable file
-#if wxUSE_FILENAME
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);
-#else // !wxUSE_FILENAME
-        m_appName = argv[0];
-#endif // wxUSE_FILENAME/!wxUSE_FILENAME
     }
 
     return true;
@@ -512,6 +506,12 @@ wxFontMapper *wxConsoleAppTraitsBase::CreateFontMapper()
 
 #endif // wxUSE_FONTMAP
 
+wxRendererNative *wxConsoleAppTraitsBase::CreateRenderer()
+{
+    // console applications don't use renderers
+    return NULL;
+}
+
 #ifdef __WXDEBUG__
 bool wxConsoleAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {