github-mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-19 07:54:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with PrusaDataViewBitmapText ctor on Linux

Browse Source 
+ Cleaned code from unusable comments
This commit is contained in:
YuSanka
2018-09-12 13:22:13 +02:00
parent 6d499525ee
commit 77e09e683d
3 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xs/src/slic3r/GUI/wxExtensions.hpp
View File

@@ -220,13 +220,11 @@ public:
PrusaObjectDataViewModelNode( PrusaObjectDataViewModelNode* parent,
const wxString& sub_obj_name,
const wxBitmap& bmp,
// const wxIcon& icon,
const wxString& extruder,
const int volume_id=-1) {
m_parent = parent;
m_name = sub_obj_name;
m_copy = wxEmptyString;
// m_icon = icon;
m_bmp = bmp;
m_type = "volume";
m_volume_id = volume_id;
@@ -321,10 +319,8 @@ public:
switch (col)
{
case 0:{
// wxDataViewIconText data;
PrusaDataViewBitmapText data;
data << variant;
// m_icon = data.GetIcon();
m_bmp = data.GetBitmap();
m_name = data.GetText();
return true;}
@@ -414,7 +410,6 @@ public:
wxDataViewItem Add(const wxString &name, const int instances_count);
wxDataViewItem AddChild(const wxDataViewItem &parent_item,
const wxString &name,
// const wxIcon& icon,
const wxBitmap& icon,
const int extruder = 0,
const bool create_frst_child = true);
@@ -478,7 +473,7 @@ class PrusaBitmapTextRenderer : public wxDataViewCustomRenderer
public:
PrusaBitmapTextRenderer( wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT):
wxDataViewCustomRenderer(wxT("PrusaDataViewIconBitmapText"/*"wxDataViewIconText"*/), mode, align) {}
wxDataViewCustomRenderer(wxT("wxObject"), mode, align) {}
bool SetValue(const wxVariant &value);
bool GetValue(wxVariant &value) const;