diff options
Diffstat (limited to 'src/slic3r/GUI/ExtraRenderers.cpp')
| -rw-r--r-- | src/slic3r/GUI/ExtraRenderers.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp index 5ad433a29..d72e1dd32 100644 --- a/src/slic3r/GUI/ExtraRenderers.cpp +++ b/src/slic3r/GUI/ExtraRenderers.cpp @@ -322,20 +322,11 @@ wxWindow* BitmapChoiceRenderer::CreateEditorCtrl(wxWindow* parent, wxRect labelR #ifdef __linux__ c_editor->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent& evt) { -<<<<<<< HEAD - evt.StopPropagation(); -#ifdef __linux__ - // FinishEditing grabs new selection and triggers config update. We better call - // it explicitly, automatic update on KILL_FOCUS didn't work on Linux. - this->FinishEditing(); -#endif -======= // to avoid event propagation to other sidebar items evt.StopPropagation(); // FinishEditing grabs new selection and triggers config update. We better call // it explicitly, automatic update on KILL_FOCUS didn't work on Linux. this->FinishEditing(); ->>>>>>> master }); #else // to avoid event propagation to other sidebar items |