3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-21 05:37:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Next try to fix OSX/Linux compilation bug

Browse source
This commit is contained in:
YuSanka 2018-06-05 10:41:20 +02:00
parent bb27d62ba8
commit 72541ad13e
3 changed files with 47 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,11 @@ public:
#endif //__WXMSW__
void Collapse(bool collapse) override;
void OnStateChange_(const wxSize& sz); //override of OnStateChange
void show_it(bool show) { Show(show); OnStateChange_(GetBestSize()); }
virtual bool Show(bool show=true) override {
wxCollapsiblePane::Show(show);
OnStateChange_(GetBestSize());
return true;
}
};
@ -213,6 +217,26 @@ public:
{
return m_children.GetCount();
}
bool SetValue(const wxVariant &variant, unsigned int col)
{
switch (col)
{
case 0:
m_name = variant.GetString();
return true;
case 1:
m_copy = variant.GetString();
return true;
case 2:
m_scale = variant.GetString();
return true;
default:
printf("MyObjectTreeModel::SetValue: wrong column");
}
return false;
}
};
// ----------------------------------------------------------------------------
@ -253,6 +277,7 @@ public:
const wxDataViewItem &item, unsigned int col) const override;
virtual bool SetValue(const wxVariant &variant,
const wxDataViewItem &item, unsigned int col) override;
bool SetValue(const wxVariant &variant, const int item_idx, unsigned int col);
// virtual bool IsEnabled(const wxDataViewItem &item,
// unsigned int col) const override;