Merge branch 'master' into update-wx

This commit is contained in:
Robin Dunn
2021-12-13 21:40:18 -08:00
206 changed files with 923 additions and 877 deletions

View File

@@ -565,7 +565,7 @@ void i_wxPyReinitializeModules() {
// function in a dyn-loaded DLL. When modules are cleaned up then that
// DLL will be unloaded, leaving a dangling function pointer. We'll
// likely end up with multiple instances of some things, but that is
// better than the alternaive currently.
// better than the alternative currently.
//wxModule::CleanUpModules();
wxModule::RegisterModules();