Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation

1 files changed, 7 insertions, 0 deletions

diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
index 833070e03..7c359f3d7 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
@@ -9,6 +9,7 @@
 class wxBitmapComboBox;
 class wxStaticText;
 class LockButton;
+class wxStaticBitmap;
 
 namespace Slic3r {
 namespace GUI {
@@ -69,6 +70,9 @@ class ObjectManipulation : public OG_Settings
     LockButton*     m_lock_bnt{ nullptr };
     wxBitmapComboBox* m_word_local_combo = nullptr;
 
+    ScalableBitmap  m_manifold_warning_bmp;
+    wxStaticBitmap* m_fix_throught_netfab_bitmap;
+
 #ifndef __APPLE__
     // Currently focused option name (empty if none)
     std::string     m_focused_option;
@@ -100,6 +104,9 @@ public:
     void emulate_kill_focus();
 #endif // __APPLE__
 
+    void update_warning_icon_state(const wxString& tooltip);
+    void msw_rescale();
+
 private:
     void reset_settings_value();
     void update_settings_value(const Selection& selection);