To fix blurred icons under OSX there is implemented PresetBitmapComboBox, derived from wxBitmapComboBox,

which now will be used for preset choosers on sidebar a preset tabs.

+ for BitmapCache class added m_scale used for correct scaling of SVG images on Retina displays

+ some code clearing from unused functions or function's parameters

1 files changed, 2 insertions, 2 deletions

diff --git a/src/slic3r/GUI/PresetBundle.hpp b/src/slic3r/GUI/PresetBundle.hpp
index 037c47c5f..bf64e0d34 100644
--- a/src/slic3r/GUI/PresetBundle.hpp
+++ b/src/slic3r/GUI/PresetBundle.hpp
@@ -131,7 +131,7 @@ public:
 
     static bool                 parse_color(const std::string &scolor, unsigned char *rgb_out);
 
-    void                        load_default_preset_bitmaps(wxWindow *window);
+    void                        load_default_preset_bitmaps();
 
     // Set the is_visible flag for printer vendors, printer models and printer variants
     // based on the user configuration.
@@ -160,7 +160,7 @@ private:
     // If it is not an external config, then the config will be stored into the user profile directory.
     void                        load_config_file_config(const std::string &name_or_path, bool is_external, DynamicPrintConfig &&config);
     void                        load_config_file_config_bundle(const std::string &path, const boost::property_tree::ptree &tree);
-    void                        load_compatible_bitmaps(wxWindow *window);
+    void                        load_compatible_bitmaps();
 
     DynamicPrintConfig          full_fff_config() const;
     DynamicPrintConfig          full_sla_config() const;