Merge remote-tracking branch 'origin/master' into ys_msw_dpi

1 files changed, 3 insertions, 2 deletions

diff --git a/src/slic3r/GUI/Preset.hpp b/src/slic3r/GUI/Preset.hpp
index 989d0c392..6174af623 100644
--- a/src/slic3r/GUI/Preset.hpp
+++ b/src/slic3r/GUI/Preset.hpp
@@ -15,6 +15,7 @@ class wxBitmapComboBox;
 class wxChoice;
 class wxItemContainer;
 class wxString;
+class wxWindow;
 
 namespace Slic3r {
 
@@ -276,10 +277,10 @@ public:
     bool            delete_current_preset();
 
     // Load default bitmap to be placed at the wxBitmapComboBox of a MainFrame.
-    bool            load_bitmap_default(const std::string &file_name);
+    void            load_bitmap_default(wxWindow *window, const std::string &file_name);
 
     // Load "add new printer" bitmap to be placed at the wxBitmapComboBox of a MainFrame.
-    bool            load_bitmap_add(const std::string &file_name);
+    void            load_bitmap_add(wxWindow *window, const std::string &file_name);
 
     // Compatible & incompatible marks, to be placed at the wxBitmapComboBox items.
     void            set_bitmap_compatible  (const wxBitmap *bmp) { m_bitmap_compatible   = bmp; }