X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c193821a999730fbf6a9bea83763f37daae68f1..fd938b117780571129a03155ea0dc01fc73b7f23:/src/common/appbase.cpp?ds=sidebyside diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index 216d9b8647..5971f3962b 100644 --- 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) {