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:
authorYuSanka <yusanka@gmail.com>2019-04-25 02:45:00 +0300
committerYuSanka <yusanka@gmail.com>2019-04-25 02:45:00 +0300
commit065448e9e5f63f412ac59c8fbbea560f2cccf77e (patch)
tree03dc97265e1f4f750f12e0f6b7cf1e5b37399ed7 /src/slic3r/GUI/GUI_ObjectSettings.hpp
parentbe60f0a53c6da7121d99a5a2bfaa58519ebf4c8d (diff)
Big Refactoring: - deleted/renamed all _Prusa_ prefixes,
- cleaned code from commented parts - rescale() -> msw_rescale()
Diffstat (limited to 'src/slic3r/GUI/GUI_ObjectSettings.hpp')
-rw-r--r--src/slic3r/GUI/GUI_ObjectSettings.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/slic3r/GUI/GUI_ObjectSettings.hpp b/src/slic3r/GUI/GUI_ObjectSettings.hpp
index 17accda18..3d49f13b7 100644
--- a/src/slic3r/GUI/GUI_ObjectSettings.hpp
+++ b/src/slic3r/GUI/GUI_ObjectSettings.hpp
@@ -38,7 +38,7 @@ class ObjectSettings : public OG_Settings
// option groups for settings
std::vector <std::shared_ptr<ConfigOptionsGroup>> m_og_settings;
- PrusaBitmap m_bmp_delete;
+ ScalableBitmap m_bmp_delete;
public:
ObjectSettings(wxWindow* parent);
@@ -46,7 +46,7 @@ public:
void update_settings_list();
void UpdateAndShow(const bool show) override;
- void rescale();
+ void msw_rescale();
};
}}