Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVojtech Kral <vojtech@kral.hk>2019-04-09 18:40:14 +0300
committerVojtech Kral <vojtech@kral.hk>2019-04-09 19:01:45 +0300
commit81f4ce5f2ef68b9b14b350405075fb2d185bdf32 (patch)
tree4c8639bad61eb78714e32cd6f344985f7517ab22 /src/slic3r/GUI/PresetBundle.hpp
parentd399ebacc9407ca4ae423c4c0651e9cf7c101a42 (diff)
Bitmaps: Pass wxWindow context in a few more places
Diffstat (limited to 'src/slic3r/GUI/PresetBundle.hpp')
-rw-r--r--src/slic3r/GUI/PresetBundle.hpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/slic3r/GUI/PresetBundle.hpp b/src/slic3r/GUI/PresetBundle.hpp
index 1f627d045..069ebd784 100644
--- a/src/slic3r/GUI/PresetBundle.hpp
+++ b/src/slic3r/GUI/PresetBundle.hpp
@@ -7,6 +7,8 @@
#include <set>
#include <boost/filesystem/path.hpp>
+class wxWindow;
+
namespace Slic3r {
namespace GUI {
@@ -127,7 +129,7 @@ public:
static bool parse_color(const std::string &scolor, unsigned char *rgb_out);
- void load_default_preset_bitmaps();
+ void load_default_preset_bitmaps(wxWindow *window);
private:
std::string load_system_presets();
@@ -148,7 +150,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();
+ void load_compatible_bitmaps(wxWindow *window);
DynamicPrintConfig full_fff_config() const;
DynamicPrintConfig full_sla_config() const;