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-05-02 09:33:38 +0300
committerYuSanka <yusanka@gmail.com>2019-05-02 09:33:38 +0300
commitb048669a3bf533ae0158ea9dd16bf6c6090165ea (patch)
tree6ae57a5137dd70c1cf1eb83f47a25953af13a4e4 /src/slic3r/GUI/GUI_ObjectManipulation.cpp
parent7f37f82ad4696543af0cab8f5b7453644aef639f (diff)
Changed update_warning_icon_state() signature
(next try to fix OSX compilation)
Diffstat (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.cpp')
-rw-r--r--src/slic3r/GUI/GUI_ObjectManipulation.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
index 86d8e9a96..bb6eec963 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@@ -66,7 +66,7 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
return;
wxGetApp().obj_list()->fix_through_netfabb();
- update_warning_icon_state(wxGetApp().obj_list()->get_mesh_errors_list());
+ update_warning_icon_state(/*wxGetApp().obj_list()->get_mesh_errors_list()*/);
});
return sizer;
@@ -365,8 +365,10 @@ void ObjectManipulation::emulate_kill_focus()
on_change(option, 0);
}
-void ObjectManipulation::update_warning_icon_state(const wxString& tooltip)
+void ObjectManipulation::update_warning_icon_state(/*const wxString& tooltip*/)
{
+ const wxString& tooltip = wxGetApp().obj_list()->get_mesh_errors_list();
+
m_fix_throught_netfab_bitmap->SetBitmap(tooltip.IsEmpty() ? wxNullBitmap : m_manifold_warning_bmp.bmp());
m_fix_throught_netfab_bitmap->SetToolTip(tooltip);
}