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

Work around wxPropertyGrid state loss on modules reinitialization

Browse Source 
Don't reallocate wxPGGlobalVars if it's somehow already allocated when
wxPGGlobalVarsClassManager::OnInit() is called: this is not supposed to
happen but it does when wxPython redoes the modules initialization after
loading another module.

See #23165.
This commit is contained in:
Vadim Zeitlin 2023-01-30 21:15:22 +01:00
parent 9b4ec1963f
commit edbd9094e8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/propgrid/propgrid.cpp
View File

@ -145,7 +145,15 @@ class wxPGGlobalVarsClassManager : public wxModule
wxDECLARE_DYNAMIC_CLASS(wxPGGlobalVarsClassManager);
public:
wxPGGlobalVarsClassManager() {}
virtual bool OnInit() wxOVERRIDE { wxPGGlobalVars = new wxPGGlobalVarsClass(); return true; }
virtual bool OnInit() wxOVERRIDE
{
// This shouldn't happen, but we can actually be more called more than
// once, e.g. wxPython does it, see #23165, and in this case we
// shouldn't lose the current state.
if ( !wxPGGlobalVars )
wxPGGlobalVars = new wxPGGlobalVarsClass();
return true;
}
virtual void OnExit() wxOVERRIDE { wxDELETE(wxPGGlobalVars); }
};