wxTheApp can't be assigned to, anyhow, so make ms_appInstance private and provide Get/SetInstance() methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -81,7 +81,7 @@ public:
|
||||
{
|
||||
// the pointer is going to be deleted in the base class dtor, don't
|
||||
// leave the dangling pointer!
|
||||
wxTheApp = NULL;
|
||||
wxApp::SetInstance(NULL);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ public:
|
||||
{
|
||||
reset(ptr);
|
||||
|
||||
wxTheApp = ptr;
|
||||
wxApp::SetInstance(ptr);
|
||||
}
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxAppPtr)
|
||||
@@ -356,7 +356,7 @@ void wxEntryCleanup()
|
||||
wxTheApp->CleanUp();
|
||||
|
||||
delete wxTheApp;
|
||||
wxTheApp = NULL;
|
||||
wxApp::SetInstance(NULL);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user