From 33280b7069594be02e37c8eda84f6af8da1ef2c1 Mon Sep 17 00:00:00 2001 From: YuSanka <yusanka@gmail.com> Date: Thu, 1 Feb 2018 10:01:05 +0100 Subject: [PATCH] Next try fix compilation on OSX --- xs/src/slic3r/GUI/Tab.cpp | 3 +-- xs/src/slic3r/GUI/Tab.hpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xs/src/slic3r/GUI/Tab.cpp b/xs/src/slic3r/GUI/Tab.cpp index 2dd6df35b..12e000e99 100644 --- a/xs/src/slic3r/GUI/Tab.cpp +++ b/xs/src/slic3r/GUI/Tab.cpp @@ -84,10 +84,9 @@ void Tab::create_preset_tab(PresetBundle *preset_bundle) m_treectrl->Bind(wxEVT_TREE_SEL_CHANGED, &Tab::OnTreeSelChange, this); m_treectrl->Bind(wxEVT_KEY_DOWN, &Tab::OnKeyDown, this); - m_treectrl->Bind(wxEVT_COMBOBOX, &Tab::OnComboBox, this); m_presets_choice->Bind(wxEVT_COMBOBOX, ([this](wxCommandEvent e){ - select_preset(static_cast<const wxBitmapComboBox*>(m_presets_choice)->GetStringSelection().ToStdString()); + select_preset(static_cast<const wxBitmapComboBox*>(m_presets_choice)->wxComboBox::GetStringSelection().ToStdString()); })); m_btn_save_preset->Bind(wxEVT_BUTTON, ([this](wxCommandEvent e){ save_preset(); })); diff --git a/xs/src/slic3r/GUI/Tab.hpp b/xs/src/slic3r/GUI/Tab.hpp index 0934d5adc..ab0df4629 100644 --- a/xs/src/slic3r/GUI/Tab.hpp +++ b/xs/src/slic3r/GUI/Tab.hpp @@ -138,8 +138,7 @@ public: void OnTreeSelChange(wxTreeEvent& event); void OnKeyDown(wxKeyEvent& event); - void OnComboBox(wxCommandEvent& event) { - select_preset(static_cast<const wxComboBox*>(m_presets_choice)->GetStringSelection().ToStdString()); } + void save_preset(std::string name = ""); void delete_preset(); void toggle_show_hide_incompatible();