diff options
| author | enricoturri1966 <enricoturri@seznam.cz> | 2021-02-25 16:28:53 +0300 |
|---|---|---|
| committer | enricoturri1966 <enricoturri@seznam.cz> | 2021-02-25 16:28:53 +0300 |
| commit | 4146fd337a441c1cadd5eaab08953377b45760e0 (patch) | |
| tree | 97cf20e9f6e5eaa852eb73c26cc764d4d9efb6e5 /src/slic3r/GUI/OpenGLManager.cpp | |
| parent | 8f8217723ced26cd3d24ed8a7a31d49959e786fd (diff) | |
Tech ENABLE_HACK_CLOSING_ON_OSX_10_9_5 set as default
Diffstat (limited to 'src/slic3r/GUI/OpenGLManager.cpp')
| -rw-r--r-- | src/slic3r/GUI/OpenGLManager.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/slic3r/GUI/OpenGLManager.cpp b/src/slic3r/GUI/OpenGLManager.cpp index 4f1e00793..0fa97bfc1 100644 --- a/src/slic3r/GUI/OpenGLManager.cpp +++ b/src/slic3r/GUI/OpenGLManager.cpp @@ -14,14 +14,10 @@ #include <wx/glcanvas.h> #include <wx/msgdlg.h> -#if ENABLE_HACK_CLOSING_ON_OSX_10_9_5 #ifdef __APPLE__ // Part of hack to remove crash when closing the application on OSX 10.9.5 when building against newer wxWidgets #include <wx/platinfo.h> -#endif // __APPLE__ -#endif // ENABLE_HACK_CLOSING_ON_OSX_10_9_5 -#ifdef __APPLE__ #include "../Utils/MacDarkMode.hpp" #endif // __APPLE__ @@ -202,34 +198,26 @@ bool OpenGLManager::s_compressed_textures_supported = false; OpenGLManager::EMultisampleState OpenGLManager::s_multisample = OpenGLManager::EMultisampleState::Unknown; OpenGLManager::EFramebufferType OpenGLManager::s_framebuffers_type = OpenGLManager::EFramebufferType::Unknown; -#if ENABLE_HACK_CLOSING_ON_OSX_10_9_5 #ifdef __APPLE__ // Part of hack to remove crash when closing the application on OSX 10.9.5 when building against newer wxWidgets OpenGLManager::OSInfo OpenGLManager::s_os_info; #endif // __APPLE__ -#endif // ENABLE_HACK_CLOSING_ON_OSX_10_9_5 OpenGLManager::~OpenGLManager() { m_shaders_manager.shutdown(); -#if ENABLE_HACK_CLOSING_ON_OSX_10_9_5 #ifdef __APPLE__ // This is an ugly hack needed to solve the crash happening when closing the application on OSX 10.9.5 with newer wxWidgets // The crash is triggered inside wxGLContext destructor if (s_os_info.major != 10 || s_os_info.minor != 9 || s_os_info.micro != 5) { #endif //__APPLE__ -#endif // ENABLE_HACK_CLOSING_ON_OSX_10_9_5 - if (m_context != nullptr) delete m_context; - -#if ENABLE_HACK_CLOSING_ON_OSX_10_9_5 #ifdef __APPLE__ } #endif //__APPLE__ -#endif // ENABLE_HACK_CLOSING_ON_OSX_10_9_5 } bool OpenGLManager::init_gl() @@ -286,14 +274,12 @@ wxGLContext* OpenGLManager::init_glcontext(wxGLCanvas& canvas) if (m_context == nullptr) { m_context = new wxGLContext(&canvas); -#if ENABLE_HACK_CLOSING_ON_OSX_10_9_5 #ifdef __APPLE__ // Part of hack to remove crash when closing the application on OSX 10.9.5 when building against newer wxWidgets s_os_info.major = wxPlatformInfo::Get().GetOSMajorVersion(); s_os_info.minor = wxPlatformInfo::Get().GetOSMinorVersion(); s_os_info.micro = wxPlatformInfo::Get().GetOSMicroVersion(); #endif //__APPLE__ -#endif // ENABLE_HACK_CLOSING_ON_OSX_10_9_5 } return m_context; } |