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

Fixed build on MAC

Browse Source
This commit is contained in:
Enrico Turri 2020-03-02 11:40:35 +01:00
parent 2f8970de86
commit 10d2193645
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -1472,7 +1472,11 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D& bed, Camera& camera, GLToolbar
#if ENABLE_RETINA_GL #if ENABLE_RETINA_GL
m_retina_helper.reset(new RetinaHelper(canvas)); m_retina_helper.reset(new RetinaHelper(canvas));
// set default view_toolbar icons size equal to GLGizmosManager::Default_Icons_Size // set default view_toolbar icons size equal to GLGizmosManager::Default_Icons_Size
#if ENABLE_NON_STATIC_CANVAS_MANAGER
wxGetApp().plater()->get_view_toolbar().set_icons_size(GLGizmosManager::Default_Icons_Size);
#else
m_view_toolbar.set_icons_size(GLGizmosManager::Default_Icons_Size); m_view_toolbar.set_icons_size(GLGizmosManager::Default_Icons_Size);
#endif // ENABLE_NON_STATIC_CANVAS_MANAGER
#endif #endif
} }

4
src/slic3r/GUI/GLCanvas3DManager.cpp
View File

@ -8,7 +8,9 @@
#include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/classification.hpp>
#if ENABLE_NON_STATIC_CANVAS_MANAGER
#include <boost/log/trivial.hpp>
#endif // ENABLE_NON_STATIC_CANVAS_MANAGER
#include <wx/glcanvas.h> #include <wx/glcanvas.h>
#include <wx/timer.h> #include <wx/timer.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>