replaced the old wxApp with wxAppConsole::ms_appInstance of type wxAppConsole; wxTheApp is now a macro for backwards compatibility (this fixes problems with contradictorary wxTheApp definitions in separate build)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-01 23:00:16 +00:00
parent 07e9078279
commit 7cafd224fe
3 changed files with 24 additions and 20 deletions
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -89,7 +89,7 @@
 // global vars
 // ----------------------------------------------------------------------------

-wxApp *wxTheApp = NULL;
+wxAppConsole *wxAppConsole::ms_appInstance = NULL;

 wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL;

@@ -105,7 +105,7 @@ wxAppConsole::wxAppConsole()
 {
    m_traits = NULL;

-    wxTheApp = (wxApp *)this;
+    ms_appInstance = this;

 #ifdef __WXDEBUG__
    SetTraceMasks();