Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed build-time condition SDK >= 10.14 (#2377)

Browse Source 
"trigger redraw upon shown for layer-backed views" is also needed when building with sdk 10.13

the build-time check that the used SDK must be 10.14 or higher is not needed
I checked building with SDK 10.12 and 10.13

the used NsView functions are available in far older SDK's
* https://developer.apple.com/documentation/appkit/nsview/1483475-setneedsdisplay
 Availability macOS 10.0+ 
* https://developer.apple.com/documentation/appkit/nsview/1483473-ishiddenorhashiddenancestor
 Availability macOS 10.3+

I did not add an ifdef checking for sdk 10.3 or higher - I assume the minimum requirement for building wxWidgets is higher than 10.3

see also e484a2db19
This commit is contained in:
Tijs Vermeulen
2021-06-03 18:18:20 +02:00
committed by GitHub
parent 3417c8e48b
commit 7ca4705bd7
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osx/cocoa/window.mm
View File

@@ -2622,11 +2622,9 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible )
[m_osxView setHidden:(visible ? NO:YES)]; [m_osxView setHidden:(visible ? NO:YES)];
// trigger redraw upon shown for layer-backed views // trigger redraw upon shown for layer-backed views
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
if ( WX_IS_MACOS_AVAILABLE(10, 14 ) ) if ( WX_IS_MACOS_AVAILABLE(10, 14 ) )
if( !m_osxView.isHiddenOrHasHiddenAncestor ) if( !m_osxView.isHiddenOrHasHiddenAncestor )
SetNeedsDisplay(NULL); SetNeedsDisplay(NULL);
#endif
} }
double wxWidgetCocoaImpl::GetContentScaleFactor() const double wxWidgetCocoaImpl::GetContentScaleFactor() const
@@ -3080,7 +3078,6 @@ void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &hei
} }
} }
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
namespace namespace
{ {
@@ -3114,7 +3111,6 @@ void SetSubviewsNeedDisplay( NSView *view, NSRect rect )
} }
} }
#endif
void wxWidgetCocoaImpl::SetNeedsDisplay( const wxRect* where ) void wxWidgetCocoaImpl::SetNeedsDisplay( const wxRect* where )
@@ -3129,7 +3125,6 @@ void wxWidgetCocoaImpl::SetNeedsDisplay( const wxRect* where )
// Layer-backed views (which are all in Mojave's Dark Mode) may not have // Layer-backed views (which are all in Mojave's Dark Mode) may not have
// their children implicitly redrawn with the parent. For compatibility, // their children implicitly redrawn with the parent. For compatibility,
// do it manually here: // do it manually here:
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
if ( WX_IS_MACOS_AVAILABLE(10, 14 ) ) if ( WX_IS_MACOS_AVAILABLE(10, 14 ) )
{ {
if ( where ) if ( where )
@@ -3137,7 +3132,6 @@ void wxWidgetCocoaImpl::SetNeedsDisplay( const wxRect* where )
else else
SetSubviewsNeedDisplay(m_osxView); SetSubviewsNeedDisplay(m_osxView);
} }
#endif
} }
bool wxWidgetCocoaImpl::GetNeedsDisplay() const bool wxWidgetCocoaImpl::GetNeedsDisplay() const