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

Fixed compilation bag on GTK and OSX

Browse source
This commit is contained in:
YuSanka 2018-05-11 11:25:28 +02:00
parent 2e7d623ee4
commit 27769edab2
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xs/src/slic3r/GUI/wxExtensions.cpp
View file

@ -172,8 +172,10 @@ void wxDataViewTreeCtrlComboPopup::OnDataViewTreeCtrlSelection(wxCommandEvent& e
cmb->SetText(selected); cmb->SetText(selected);
} }
// ----------------------------------------------------------------------------
// *** PrusaCollapsiblePane *** // *** PrusaCollapsiblePane ***
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef __WXMSW__
bool PrusaCollapsiblePane::Create(wxWindow *parent, wxWindowID id, const wxString& label, bool PrusaCollapsiblePane::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos, const wxSize& size, long style, const wxValidator& val, const wxString& name) const wxPoint& pos, const wxSize& size, long style, const wxValidator& val, const wxString& name)
{ {
@ -284,6 +286,7 @@ bool PrusaCollapsiblePane::Layout()
return true; return true;
} }
#endif //__WXMSW__
// ***************************************************************************** // *****************************************************************************
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

8
xs/src/slic3r/GUI/wxExtensions.hpp
View file

@ -70,8 +70,6 @@ class PrusaCollapsiblePane : public wxCollapsiblePane
#endif //__WXMSW__ #endif //__WXMSW__
public: public:
PrusaCollapsiblePane() {} PrusaCollapsiblePane() {}
PrusaCollapsiblePane( wxWindow *parent, PrusaCollapsiblePane( wxWindow *parent,
wxWindowID winid, wxWindowID winid,
const wxString& label, const wxString& label,
@ -84,7 +82,7 @@ public:
#ifdef __WXMSW__ #ifdef __WXMSW__
Create(parent, winid, label, pos, size, style, val, name); Create(parent, winid, label, pos, size, style, val, name);
#else #else
this->Create(parent, winid, label); Create(parent, winid, label);
#endif //__WXMSW__ #endif //__WXMSW__
this->Bind(wxEVT_COLLAPSIBLEPANE_CHANGED, ([parent, this](wxCommandEvent e){ this->Bind(wxEVT_COLLAPSIBLEPANE_CHANGED, ([parent, this](wxCommandEvent e){
wxWindowUpdateLocker noUpdates_cp(this); wxWindowUpdateLocker noUpdates_cp(this);
@ -95,6 +93,9 @@ public:
})); }));
} }
~PrusaCollapsiblePane() {}
#ifdef __WXMSW__
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString& label, const wxString& label,
@ -104,7 +105,6 @@ public:
const wxValidator& val, const wxValidator& val,
const wxString& name); const wxString& name);
#ifdef __WXMSW__
void UpdateBtnBmp(); void UpdateBtnBmp();
void Collapse(bool collapse) override; void Collapse(bool collapse) override;
void SetLabel(const wxString &label) override; void SetLabel(const wxString &label) override;