Guard wxToolTip::GetToolTipCtrl() for wx 3.3 and add explicit wx/utils.h includes
- Wrap GetToolTipCtrl() call in GUI_App.cpp with #if wxVERSION_NUMBER < 3300 guard, as this API may not be accessible in wxWidgets 3.3. The dark tooltip theming is cosmetic and non-critical. - Add explicit #include <wx/utils.h> to 7 source files that use functions from that header (wxGetMousePosition, wxLaunchDefaultBrowser, wxGetDisplaySize, wxBell) but relied on transitive includes. This preempts breakage from wxWidgets 3.3 reducing transitive includes. Files with wx/utils.h added: BBLTopbar.cpp, CreatePresetsDialog.cpp, CameraPopup.cpp, GLCanvas3D.cpp, GCodeViewer.cpp, GUI_ObjectList.cpp, FilamentMapPanel.cpp. Skipped BindDialog.cpp and FilamentPickerDialog.cpp as they already include wx/wx.h which provides wx/utils.h transitively. Part of wxWidgets 3.1.5 -> 3.3.2 upgrade.
This commit is contained in:
@@ -4292,8 +4292,10 @@ void GUI_App::force_colors_update()
|
||||
#ifdef _MSW_DARK_MODE
|
||||
#ifdef __WINDOWS__
|
||||
NppDarkMode::SetDarkMode(dark_mode());
|
||||
#if wxVERSION_NUMBER < 3300
|
||||
if (WXHWND wxHWND = wxToolTip::GetToolTipCtrl())
|
||||
NppDarkMode::SetDarkExplorerTheme((HWND)wxHWND);
|
||||
#endif
|
||||
NppDarkMode::SetDarkTitleBar(mainframe->GetHWND());
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user