diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h index 4cb5623b49..be024d346f 100644 --- a/include/wx/osx/cocoa/chkconf.h +++ b/include/wx/osx/cocoa/chkconf.h @@ -11,17 +11,6 @@ #ifndef _WX_OSX_COCOA_CHKCONF_H_ #define _WX_OSX_COCOA_CHKCONF_H_ -/* Many wchar functions (and also strnlen(), for some reason) are only - available since 10.7 so don't use them if we want to build the applications - that would run under 10.6 and earlier. */ -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7 -#define HAVE_STRNLEN 1 -#define HAVE_WCSDUP 1 -#define HAVE_WCSNLEN 1 -#define HAVE_WCSCASECMP 1 -#define HAVE_WCSNCASECMP 1 -#endif - /* * native (1) or emulated (0) toolbar */ @@ -52,13 +41,10 @@ /* Use the more efficient FSEvents API instead of kqueue - events for file system watcher, but only on OS X >= 10.7 since - that version introduced a flag that allows watching files as - well as sub directories. + events for file system watcher since that version introduced a flag that + allows watching files as well as sub directories. */ -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7 - #define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1 -#endif +#define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1 /* * turning off capabilities that don't work under cocoa yet diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h index 0146ec98b1..56aef33402 100644 --- a/include/wx/osx/config_xcode.h +++ b/include/wx/osx/config_xcode.h @@ -24,7 +24,6 @@ #define HAVE_VA_COPY 1 #define HAVE_VARIADIC_MACROS 1 #define HAVE_STD_WSTRING 1 -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 #if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 2 ) #if !defined(__has_include) #define HAVE_TR1_UNORDERED_MAP 1 @@ -33,7 +32,6 @@ #endif #define HAVE_GCC_ATOMIC_BUILTINS 1 #endif -#endif #define HAVE_VISIBILITY 1 #define wxHAVE_PTHREAD_CLEANUP 1 #define CONST_COMPATIBILITY 0 @@ -59,6 +57,7 @@ #define HAVE_UNIX98_PRINTF 1 #define HAVE_STATFS 1 #define HAVE_STATFS_DECL 1 +#define HAVE_STRNLEN 1 #define HAVE_STRPTIME 1 #define HAVE_STRPTIME_DECL 1 #define HAVE_STRTOULL 1 @@ -68,7 +67,11 @@ #define HAVE_VSSCANF 1 #define HAVE_VSSCANF_DECL 1 #define HAVE_USLEEP 1 +#define HAVE_WCSCASECMP 1 +#define HAVE_WCSDUP 1 #define HAVE_WCSLEN 1 +#define HAVE_WCSNCASECMP 1 +#define HAVE_WCSNLEN 1 #define SIZEOF_WCHAR_T 4 #define SIZEOF_SHORT 2 #define SIZEOF_INT 4 diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm index 7a7b41a55e..bfd0a466e7 100644 --- a/src/html/htmlctrl/webkit/webkit.mm +++ b/src/html/htmlctrl/webkit/webkit.mm @@ -28,6 +28,12 @@ #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"; // ---------------------------------------------------------------------------- @@ -130,7 +136,7 @@ inline int wxNavTypeFromWebNavType(int type){ return wxWEBKIT_NAV_OTHER; } -@interface MyFrameLoadMonitor : NSObject +@interface MyFrameLoadMonitor : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebFrameLoadDelegate) { wxWebKitCtrl* webKitWindow; } @@ -139,7 +145,7 @@ inline int wxNavTypeFromWebNavType(int type){ @end -@interface MyPolicyDelegate : NSObject +@interface MyPolicyDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebPolicyDelegate) { wxWebKitCtrl* webKitWindow; } @@ -148,7 +154,7 @@ inline int wxNavTypeFromWebNavType(int type){ @end -@interface MyUIDelegate : NSObject +@interface MyUIDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebUIDelegate) { wxWebKitCtrl* webKitWindow; } diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp index e2d640eebf..c2fa882ced 100644 --- a/src/osx/core/bitmap.cpp +++ b/src/osx/core/bitmap.cpp @@ -495,11 +495,10 @@ IconRef wxBitmapRefData::GetIconRef() switch (sz) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 case 1024: dataType = kIconServices1024PixelDataARGB; break; -#endif + case 512: dataType = kIconServices512PixelDataARGB; break; diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp index a89b043f01..b51184f701 100644 --- a/src/osx/utils_osx.cpp +++ b/src/osx/utils_osx.cpp @@ -63,13 +63,6 @@ bool wxColourDisplay() #if wxOSX_USE_COCOA_OR_CARBON -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1060) -// bring back declaration so that we can support deployment targets < 10_6 -CG_EXTERN size_t CGDisplayBitsPerPixel(CGDirectDisplayID display) -CG_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_6, - __IPHONE_NA, __IPHONE_NA); -#endif - // Returns depth of screen int wxDisplayDepth() { diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm index 1c8e4f03f9..5eb143ed84 100644 --- a/src/osx/webview_webkit.mm +++ b/src/osx/webview_webkit.mm @@ -41,6 +41,12 @@ #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 // ---------------------------------------------------------------------------- @@ -50,7 +56,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView); wxBEGIN_EVENT_TABLE(wxWebViewWebKit, wxControl) wxEND_EVENT_TABLE() -@interface WebViewLoadDelegate : NSObject +@interface WebViewLoadDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebFrameLoadDelegate) { wxWebViewWebKit* webKitWindow; } @@ -59,7 +65,7 @@ wxEND_EVENT_TABLE() @end -@interface WebViewPolicyDelegate : NSObject +@interface WebViewPolicyDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebPolicyDelegate) { wxWebViewWebKit* webKitWindow; } @@ -68,7 +74,7 @@ wxEND_EVENT_TABLE() @end -@interface WebViewUIDelegate : NSObject +@interface WebViewUIDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebUIDelegate) { wxWebViewWebKit* webKitWindow; }