3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-22 14:13:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add back control pool

Browse source
This commit is contained in:
SoftFever 2024-06-16 01:24:44 +08:00
parent 0b9a6b5fe4
commit 1ff70be243
7 changed files with 162 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/OptionsGroup.cpp
View file

@ -532,6 +532,9 @@ bool OptionsGroup::activate(std::function<void()> throw_if_canceled/* = [](){}*/
return true;
}
void free_window(wxWindow *win);
// delete all controls from the option group
void OptionsGroup::clear(bool destroy_custom_ctrl)
{
@ -560,8 +563,10 @@ void OptionsGroup::clear(bool destroy_custom_ctrl)
if (custom_ctrl) {
for (auto const &item : m_fields) {
wxWindow* win = item.second.get()->getWindow();
if (win)
if (win) {
free_window(win);
win = nullptr;
}
}
//BBS: custom_ctrl already destroyed from sizer->clear(), no need to destroy here anymore
if (destroy_custom_ctrl)