Suppressed import/adding of the 3mf which contains multi-part objects

+ Try to fix the wrong extruder selection under OSX
This commit is contained in:
YuSanka 2018-12-10 13:39:56 +01:00
parent 1f0c12dd9f
commit 293d6ba8ad
3 changed files with 58 additions and 20 deletions

View file

@ -80,9 +80,9 @@ class ObjectList : public wxDataViewCtrl
bool m_prevent_list_events = false; // We use this flag to avoid circular event handling Select()
// happens to fire a wxEVT_LIST_ITEM_SELECTED on OSX, whose event handler
// calls this method again and again and again
#ifdef __WXOSX__
wxString m_selected_extruder = "";
#endif //__WXOSX__
// #ifdef __WXOSX__
// wxString m_selected_extruder = "";
// #endif //__WXOSX__
bool m_parts_changed = false;
bool m_part_settings_changed = false;
@ -202,8 +202,8 @@ public:
void update_settings_items();
private:
void OnStartEditing(wxDataViewEvent &event);
// void OnEditingDone(wxDataViewEvent &event);
void ItemValueChanged(wxDataViewEvent &event);
};