GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-12 23:08:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed update_warning_icon_state() signature

Browse Source 
(next try to fix OSX compilation)
This commit is contained in:
YuSanka 2019-05-02 08:33:38 +02:00
parent 7f37f82ad4
commit b048669a3b
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@ -1897,7 +1897,7 @@ void ObjectList::part_selection_changed()
if (item) { if (item) {
wxGetApp().obj_manipul()->get_og()->set_value("object_name", m_objects_model->GetName(item)); wxGetApp().obj_manipul()->get_og()->set_value("object_name", m_objects_model->GetName(item));
wxGetApp().obj_manipul()->update_warning_icon_state(get_mesh_errors_list(obj_idx, volume_id)); wxGetApp().obj_manipul()->update_warning_icon_state(/*get_mesh_errors_list(obj_idx, volume_id)*/);
} }
} }

6
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View File

@ -66,7 +66,7 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
return; return;
wxGetApp().obj_list()->fix_through_netfabb(); 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; return sizer;
@ -365,8 +365,10 @@ void ObjectManipulation::emulate_kill_focus()
on_change(option, 0); 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->SetBitmap(tooltip.IsEmpty() ? wxNullBitmap : m_manifold_warning_bmp.bmp());
m_fix_throught_netfab_bitmap->SetToolTip(tooltip); m_fix_throught_netfab_bitmap->SetToolTip(tooltip);
} }

3
src/slic3r/GUI/GUI_ObjectManipulation.hpp
View File

@ -2,7 +2,6 @@
#define slic3r_GUI_ObjectManipulation_hpp_ #define slic3r_GUI_ObjectManipulation_hpp_
#include <memory> #include <memory>
#include <wx/wx.h>
#include "GUI_ObjectSettings.hpp" #include "GUI_ObjectSettings.hpp"
#include "GLCanvas3D.hpp" #include "GLCanvas3D.hpp"
@ -112,7 +111,7 @@ public:
void emulate_kill_focus(); void emulate_kill_focus();
#endif // __APPLE__ #endif // __APPLE__
void update_warning_icon_state(const wxString& tooltip); void update_warning_icon_state(/*const wxString& tooltip*/);
void msw_rescale(); void msw_rescale();
private: private: