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

SDK 10.11 minimum

Browse Source
This commit is contained in:
Stefan Csomor 2020-07-04 20:47:20 +02:00
parent 81e3760e4a
commit d49875f34f
5 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/html/htmlctrl/webkit/webkit.mm
View File

@ -30,12 +30,6 @@
#define DEBUG_WEBKIT_SIZING 0
#if defined(MAC_OS_X_VERSION_10_11) && (__MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11)
#define wxWEBKIT_PROTOCOL_SINCE_10_11(proto) < proto >
#else
#define wxWEBKIT_PROTOCOL_SINCE_10_11(proto)
#endif
extern WXDLLEXPORT_DATA(const char) wxWebKitCtrlNameStr[] = "webkitctrl";
// ----------------------------------------------------------------------------
@ -114,7 +108,7 @@ inline int wxNavTypeFromWebNavType(int type){
return wxWEBKIT_NAV_OTHER;
}
@interface MyFrameLoadMonitor : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebFrameLoadDelegate)
@interface MyFrameLoadMonitor : NSObject<WebFrameLoadDelegate>
{
wxWebKitCtrl* webKitWindow;
}
@ -123,7 +117,7 @@ inline int wxNavTypeFromWebNavType(int type){
@end
@interface MyPolicyDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebPolicyDelegate)
@interface MyPolicyDelegate : NSObject<WebPolicyDelegate>
{
wxWebKitCtrl* webKitWindow;
}
@ -132,7 +126,7 @@ inline int wxNavTypeFromWebNavType(int type){
@end
@interface MyUIDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebUIDelegate)
@interface MyUIDelegate : NSObject<WebUIDelegate>
{
wxWebKitCtrl* webKitWindow;
}

4
src/osx/cocoa/dataview.mm
View File

@ -3035,14 +3035,12 @@ bool wxDataViewTextRenderer::MacRender()
[par setLineBreakMode:[cell lineBreakMode]];
// Tightening looks very ugly when combined with non-tightened rows,
// so disabled it on OS X version where it's used:
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11
if ( WX_IS_MACOS_AVAILABLE(10, 11) )
{
[par setAllowsDefaultTighteningForTruncation:NO];
}
else
#endif
[par setTighteningFactorForTruncation:0.0];
[par setTighteningFactorForTruncation:0.0];
[str addAttribute:NSParagraphStyleAttributeName
value:par

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

@ -2828,11 +2828,10 @@ bool wxWidgetCocoaImpl::ShowWithEffect(bool show,
return ShowViewOrWindowWithEffect(m_wxPeer, show, effect, timeout);
}
// To avoid warnings about incompatible pointer types with OS X 10.11 SDK (and
// maybe even earlier? This has changed at some time between 10.9 and 10.11),
// To avoid warnings about incompatible pointer types with OS X 10.11 SDK
// we need to constrain the comparison function arguments instead of just using
// "id".
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11 && __has_feature(objc_kindof)
#if __has_feature(objc_kindof)
typedef __kindof NSView* KindOfView;
#else
typedef id KindOfView;

2
src/osx/core/colour.cpp
View File

@ -118,7 +118,6 @@ wxCGColorRefData::wxCGColorRefData(CGColorRef col)
}
else if (model != kCGColorSpaceModelRGB)
{
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11
if ( WX_IS_MACOS_AVAILABLE(10, 11) )
{
rgbacol = CGColorCreateCopyByMatchingToColorSpace(wxMacGetGenericRGBColorSpace(), kCGRenderingIntentDefault, col, NULL);
@ -126,7 +125,6 @@ wxCGColorRefData::wxCGColorRefData(CGColorRef col)
components = CGColorGetComponents(rgbacol);
}
else
#endif
{
isRGB = false;
}

12
src/osx/webview_webkit.mm
View File

@ -44,12 +44,6 @@
#define DEBUG_WEBKIT_SIZING 0
#if defined(MAC_OS_X_VERSION_10_11) && (__MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11)
#define wxWEBKIT_PROTOCOL_SINCE_10_11(proto) < proto >
#else
#define wxWEBKIT_PROTOCOL_SINCE_10_11(proto)
#endif
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
@ -59,7 +53,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);
wxBEGIN_EVENT_TABLE(wxWebViewWebKit, wxControl)
wxEND_EVENT_TABLE()
@interface WebViewLoadDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebFrameLoadDelegate)
@interface WebViewLoadDelegate : NSObject<WebFrameLoadDelegate>
{
wxWebViewWebKit* webKitWindow;
}
@ -68,7 +62,7 @@ wxEND_EVENT_TABLE()
@end
@interface WebViewPolicyDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebPolicyDelegate)
@interface WebViewPolicyDelegate : NSObject<WebPolicyDelegate>
{
wxWebViewWebKit* webKitWindow;
}
@ -77,7 +71,7 @@ wxEND_EVENT_TABLE()
@end
@interface WebViewUIDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebUIDelegate)
@interface WebViewUIDelegate : NSObject<WebUIDelegate>
{
wxWebViewWebKit* webKitWindow;
}