From 1148c8c018846c6864cd3163c695ea6fdb4428b2 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Fri, 27 Jul 2018 10:52:16 +0200 Subject: [PATCH] Experiment on OSX to understand events order --- xs/src/slic3r/GUI/GUI_ObjectParts.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xs/src/slic3r/GUI/GUI_ObjectParts.cpp b/xs/src/slic3r/GUI/GUI_ObjectParts.cpp index 03ba9198e..9b967ffe4 100644 --- a/xs/src/slic3r/GUI/GUI_ObjectParts.cpp +++ b/xs/src/slic3r/GUI/GUI_ObjectParts.cpp @@ -188,6 +188,9 @@ wxBoxSizer* content_objects_list(wxWindow *win) m_objects_ctrl->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [](wxEvent& event) { +#ifdef __WXOSX__ + wxMessageBox("DATAVIEW_SELECTION_CHANGED"); +#endif //__WXOSX__ object_ctrl_selection_changed(); }); @@ -212,12 +215,11 @@ wxBoxSizer* content_objects_list(wxWindow *win) event.Skip(); }); +#ifdef __WXMSW__ m_objects_ctrl->Bind(wxEVT_CHOICE, [](wxCommandEvent& event) { - wxMessageBox("Ku-ku"); - if (!*m_config) + if (!*m_config) return; - auto config = m_config; wxString str = event.GetString(); int extruder = str.size() > 1 ? 0 : atoi(str.c_str()); @@ -228,10 +230,12 @@ wxBoxSizer* content_objects_list(wxWindow *win) get_main_frame()->ProcessWindowEvent(e); } }); - -#ifndef __WXMSW__ +#else m_objects_ctrl->Bind(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, [](wxDataViewEvent& event) { +#ifdef __WXOSX__ + wxMessageBox("DATAVIEW_ITEM_VALUE_CHANGED"); +#endif //__WXOSX__ if (!*m_config) return; if (event.GetColumn() == 3)