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

fix linux compilation

Browse source
This commit is contained in:
Ocraftyone 2024-01-05 06:32:11 -05:00
parent 907b160007
commit 43417b0f63
No known key found for this signature in database
GPG key ID: 85836ED21AD4D125
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/EditGCodeDialog.cpp
View file

@ -658,7 +658,11 @@ void ParamsModel::GetValue(wxVariant& variant, const wxDataViewItem& item, unsig
if (col == (unsigned int)0) if (col == (unsigned int)0)
#ifdef __linux__ #ifdef __linux__
// variant << wxDataViewIconText(node->text, get_bmp_bundle(node->icon_name)->GetIconFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update // variant << wxDataViewIconText(node->text, get_bmp_bundle(node->icon_name)->GetIconFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
wxDataViewIconText(node->text, create_scaled_bitmap(node->icon_name, m_ctrl->GetParent())); {
wxIcon icon;
icon.CopyFromBitmap(create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
wxDataViewIconText(node->text, icon);
}
#else #else
// variant << DataViewBitmapText(node->text, get_bmp_bundle(node->icon_name)->GetBitmapFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update // variant << DataViewBitmapText(node->text, get_bmp_bundle(node->icon_name)->GetBitmapFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
variant << DataViewBitmapText(node->text, create_scaled_bitmap(node->icon_name, m_ctrl->GetParent())); variant << DataViewBitmapText(node->text, create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));

2
src/slic3r/GUI/EditGCodeDialog.hpp
View file

@ -63,7 +63,7 @@ protected:
void selection_changed(wxDataViewEvent& evt); void selection_changed(wxDataViewEvent& evt);
wxBoxSizer* EditGCodeDialog::create_btn_sizer(long flags); wxBoxSizer* create_btn_sizer(long flags);
}; };