From 27769edab288a5a99bcd598530a85215e7e43d90 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Fri, 11 May 2018 11:25:28 +0200
Subject: [PATCH] Fixed compilation bag on GTK and OSX
---
xs/src/slic3r/GUI/wxExtensions.cpp | 3 +++
xs/src/slic3r/GUI/wxExtensions.hpp | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/xs/src/slic3r/GUI/wxExtensions.cpp b/xs/src/slic3r/GUI/wxExtensions.cpp
index 03d6bdaef..ace0ad53a 100644
--- a/xs/src/slic3r/GUI/wxExtensions.cpp
+++ b/xs/src/slic3r/GUI/wxExtensions.cpp
@@ -172,8 +172,10 @@ void wxDataViewTreeCtrlComboPopup::OnDataViewTreeCtrlSelection(wxCommandEvent& e
cmb->SetText(selected);
}
+// ----------------------------------------------------------------------------
// *** PrusaCollapsiblePane ***
// ----------------------------------------------------------------------------
+#ifdef __WXMSW__
bool PrusaCollapsiblePane::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos, const wxSize& size, long style, const wxValidator& val, const wxString& name)
{
@@ -284,6 +286,7 @@ bool PrusaCollapsiblePane::Layout()
return true;
}
+#endif //__WXMSW__
// *****************************************************************************
// ----------------------------------------------------------------------------
diff --git a/xs/src/slic3r/GUI/wxExtensions.hpp b/xs/src/slic3r/GUI/wxExtensions.hpp
index ec3b0d479..cea4ce32b 100644
--- a/xs/src/slic3r/GUI/wxExtensions.hpp
+++ b/xs/src/slic3r/GUI/wxExtensions.hpp
@@ -70,8 +70,6 @@ class PrusaCollapsiblePane : public wxCollapsiblePane
#endif //__WXMSW__
public:
PrusaCollapsiblePane() {}
-
-
PrusaCollapsiblePane( wxWindow *parent,
wxWindowID winid,
const wxString& label,
@@ -84,7 +82,7 @@ public:
#ifdef __WXMSW__
Create(parent, winid, label, pos, size, style, val, name);
#else
- this->Create(parent, winid, label);
+ Create(parent, winid, label);
#endif //__WXMSW__
this->Bind(wxEVT_COLLAPSIBLEPANE_CHANGED, ([parent, this](wxCommandEvent e){
wxWindowUpdateLocker noUpdates_cp(this);
@@ -95,6 +93,9 @@ public:
}));
}
+ ~PrusaCollapsiblePane() {}
+
+#ifdef __WXMSW__
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& label,
@@ -104,7 +105,6 @@ public:
const wxValidator& val,
const wxString& name);
-#ifdef __WXMSW__
void UpdateBtnBmp();
void Collapse(bool collapse) override;
void SetLabel(const wxString &label) override;