From a78fa58b51b7d6a0c51c2ae127cddbd576120232 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Sun, 21 Jan 2018 21:56:20 +0100 Subject: [PATCH] Fix compilation on OSX --- xs/src/slic3r/GUI/Tab.cpp | 7 ++++--- xs/src/slic3r/GUI/Tab.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xs/src/slic3r/GUI/Tab.cpp b/xs/src/slic3r/GUI/Tab.cpp index a7e93cd22e..0732969fad 100644 --- a/xs/src/slic3r/GUI/Tab.cpp +++ b/xs/src/slic3r/GUI/Tab.cpp @@ -86,7 +86,7 @@ void Tab::create_preset_tab(PresetBundle *preset_bundle) m_treectrl->Bind(wxEVT_COMBOBOX, &Tab::OnComboBox, this); m_presets_choice->Bind(wxEVT_COMBOBOX, ([this](wxCommandEvent e){ - select_preset(m_presets_choice->GetStringSelection()); + select_preset(m_presets_choice->wxComboBox::GetStringSelection()); })); m_btn_save_preset->Bind(wxEVT_BUTTON, ([this](wxCommandEvent e){ save_preset(); })); @@ -1476,8 +1476,9 @@ void Tab::OnTreeSelChange(wxTreeEvent& event) void Tab::OnKeyDown(wxKeyEvent& event) { - (event.GetKeyCode() == WXK_TAB) ? - m_treectrl->Navigate(event.ShiftDown() ? wxNavigationKeyEvent::IsBackward : wxNavigationKeyEvent::IsForward) : + if (event.GetKeyCode() == WXK_TAB) + m_treectrl->Navigate(event.ShiftDown() ? wxNavigationKeyEvent::IsBackward : wxNavigationKeyEvent::IsForward); + else event.Skip(); } diff --git a/xs/src/slic3r/GUI/Tab.h b/xs/src/slic3r/GUI/Tab.h index 2902715348..aa69912936 100644 --- a/xs/src/slic3r/GUI/Tab.h +++ b/xs/src/slic3r/GUI/Tab.h @@ -135,7 +135,7 @@ public: void OnTreeSelChange(wxTreeEvent& event); void OnKeyDown(wxKeyEvent& event); - void OnComboBox(wxCommandEvent& event) { select_preset(m_presets_choice->GetStringSelection()); } + void OnComboBox(wxCommandEvent& event) { select_preset(m_presets_choice->wxComboBox::GetStringSelection()); } void save_preset(std::string name = ""); void delete_preset(); void toggle_show_hide_incompatible();