3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix compilation on OSX

Browse source
This commit is contained in:
bubnikv 2018-01-21 21:56:20 +01:00
parent 28c929f14d
commit a78fa58b51
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xs/src/slic3r/GUI/Tab.cpp
View file

@ -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();
}

2
xs/src/slic3r/GUI/Tab.h
View file

@ -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();