Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-08-01 23:00:16 +00:00
parent 07e9078279
commit 7cafd224fe
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/init.cpp
View File

@@ -67,7 +67,7 @@ public:
};
// we need a special kind of auto pointer to wxApp which not only deletes the
// pointer it holds in its dtor but also resets wxTheApp
// pointer it holds in its dtor but also resets the global application pointer
wxDECLARE_SCOPED_PTR(wxApp, wxAppPtrBase);
wxDEFINE_SCOPED_PTR(wxApp, wxAppPtrBase);
@@ -245,11 +245,7 @@ bool wxEntryStart(int& argc, wxChar **argv)
if ( fnCreate )
{
// he did, try to create the custom wxApp object
//
// NB: cast is needed because for the backwards-compatibility
// reasons wxTheApp is really a wxApp and not just
// wxAppConsole...
app.Set((wxApp*)(*fnCreate)());
app.Set((*fnCreate)());
}
}
@@ -257,25 +253,22 @@ bool wxEntryStart(int& argc, wxChar **argv)
{
// either IMPLEMENT_APP() was not used at all or it failed -- in any
// case we still need something
//
// NB: cast is needed because for the backwards-compatibility reasons
// wxTheApp is really a wxApp and not just wxAppConsole...
app.Set((wxApp *)new wxDummyConsoleApp);
app.Set(new wxDummyConsoleApp);
}
// wxApp initialization: this can be customized
// --------------------------------------------
if ( !wxTheApp->Initialize(argc, argv) )
if ( !app->Initialize(argc, argv) )
{
return false;
}
wxCallAppCleanup callAppCleanup(wxTheApp);
wxCallAppCleanup callAppCleanup(app.get());
// for compatibility call the old initialization function too
if ( !wxTheApp->OnInitGui() )
if ( !app->OnInitGui() )
return false;