diff --git a/src/slic3r/GUI/BitmapComboBox.cpp b/src/slic3r/GUI/BitmapComboBox.cpp index 36c15343d3..c7911f4864 100644 --- a/src/slic3r/GUI/BitmapComboBox.cpp +++ b/src/slic3r/GUI/BitmapComboBox.cpp @@ -91,8 +91,9 @@ BitmapComboBox::~BitmapComboBox() } #ifdef __APPLE__ -bool BitmapComboBox::OnAddBitmap(const wxBitmap& bitmap) +bool BitmapComboBox::OnAddBitmap(const wxBitmapBundle& bundle) { + wxBitmap bitmap = bundle.GetBitmap(bundle.GetDefaultSize()); if (bitmap.IsOk()) { // we should use scaled! size values of bitmap @@ -131,7 +132,8 @@ void BitmapComboBox::OnDrawItem(wxDC& dc, int item, int flags) const { - const wxBitmap& bmp = *(static_cast(m_bitmaps[item])); + const wxBitmapBundle& bundle = m_bitmapbundles[item]; + wxBitmap bmp = bundle.GetBitmap(bundle.GetDefaultSize()); if (bmp.IsOk()) { // we should use scaled! size values of bitmap diff --git a/src/slic3r/GUI/BitmapComboBox.hpp b/src/slic3r/GUI/BitmapComboBox.hpp index a77bf401d6..14e7e74c93 100644 --- a/src/slic3r/GUI/BitmapComboBox.hpp +++ b/src/slic3r/GUI/BitmapComboBox.hpp @@ -47,7 +47,7 @@ protected: * For this purpose control drawing methods and * control size calculation methods (virtual) are overridden. **/ -bool OnAddBitmap(const wxBitmap& bitmap) override; +bool OnAddBitmap(const wxBitmapBundle& bitmap) override; void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int flags) const override; #endif