Fixed OSX compilation bug
This commit is contained in:
parent
5f9d36e5b0
commit
fcf41c7eb8
@ -562,7 +562,7 @@ Sidebar::Sidebar(Plater *parent)
|
|||||||
p->sliced_info = new SlicedInfo(p->scrolled);
|
p->sliced_info = new SlicedInfo(p->scrolled);
|
||||||
|
|
||||||
// Sizer in the scrolled area
|
// Sizer in the scrolled area
|
||||||
scrolled_sizer->Add(p->mode_sizer, 0, wxALIGN_CENTER_HORIZONTAL | wxBOTTOM, 5);
|
scrolled_sizer->Add(p->mode_sizer, 0, wxALIGN_RIGHT/*CENTER_HORIZONTAL*/ | wxBOTTOM | wxRIGHT, 5);
|
||||||
scrolled_sizer->Add(p->sizer_presets, 0, wxEXPAND | wxLEFT, 2);
|
scrolled_sizer->Add(p->sizer_presets, 0, wxEXPAND | wxLEFT, 2);
|
||||||
scrolled_sizer->Add(p->sizer_params, 1, wxEXPAND);
|
scrolled_sizer->Add(p->sizer_params, 1, wxEXPAND);
|
||||||
scrolled_sizer->Add(p->object_info, 0, wxEXPAND | wxTOP | wxLEFT, 20);
|
scrolled_sizer->Add(p->object_info, 0, wxEXPAND | wxTOP | wxLEFT, 20);
|
||||||
|
@ -2328,7 +2328,7 @@ PrusaModeSizer::PrusaModeSizer(wxWindow *parent) :
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PrusaModeSizer::SetMode(const Slic3r::ConfigOptionMode& mode)
|
void PrusaModeSizer::SetMode(const int mode)
|
||||||
{
|
{
|
||||||
for (int m = 0; m < mode_btns.size(); m++)
|
for (int m = 0; m < mode_btns.size(); m++)
|
||||||
mode_btns[m]->SetState(m == mode);
|
mode_btns[m]->SetState(m == mode);
|
||||||
|
@ -911,7 +911,7 @@ public:
|
|||||||
PrusaModeSizer( wxWindow *parent);
|
PrusaModeSizer( wxWindow *parent);
|
||||||
~PrusaModeSizer() {}
|
~PrusaModeSizer() {}
|
||||||
|
|
||||||
void SetMode(const Slic3r::ConfigOptionMode& mode);
|
void SetMode(const /*ConfigOptionMode*/int mode);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::vector<PrusaModeButton*> mode_btns;
|
std::vector<PrusaModeButton*> mode_btns;
|
||||||
|
Loading…
Reference in New Issue
Block a user