Merge macOS version-related fixes

Notably fix build with pre-10.11 SDK.

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
+   events for file system watcher since that version introduced a flag that
-   that version introduced a flag that allows watching files as
+   allows watching files as well as sub directories.
-   well as sub directories.
  */
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
+#define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1
-    #define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1
-#endif
 
 /*
  * turning off capabilities that don't work under cocoa yet

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

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 <WebFrameLoadDelegate>
+@interface MyFrameLoadMonitor : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebFrameLoadDelegate)
 {
     wxWebKitCtrl* webKitWindow;
 }
@@ -139,7 +145,7 @@ inline int wxNavTypeFromWebNavType(int type){
 
 @end
 
-@interface MyPolicyDelegate : NSObject <WebPolicyDelegate>
+@interface MyPolicyDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebPolicyDelegate)
 {
     wxWebKitCtrl* webKitWindow;
 }
@@ -148,7 +154,7 @@ inline int wxNavTypeFromWebNavType(int type){
 
 @end
 
-@interface MyUIDelegate : NSObject <WebUIDelegate>
+@interface MyUIDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebUIDelegate)
 {
     wxWebKitCtrl* webKitWindow;
 }

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;

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()
 {

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 <WebFrameLoadDelegate>
+@interface WebViewLoadDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebFrameLoadDelegate)
 {
     wxWebViewWebKit* webKitWindow;
 }
@@ -59,7 +65,7 @@ wxEND_EVENT_TABLE()
 
 @end
 
-@interface WebViewPolicyDelegate : NSObject <WebPolicyDelegate>
+@interface WebViewPolicyDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebPolicyDelegate)
 {
     wxWebViewWebKit* webKitWindow;
 }
@@ -68,7 +74,7 @@ wxEND_EVENT_TABLE()
 
 @end
 
-@interface WebViewUIDelegate : NSObject <WebUIDelegate>
+@interface WebViewUIDelegate : NSObject wxWEBKIT_PROTOCOL_SINCE_10_11(WebUIDelegate)
 {
     wxWebViewWebKit* webKitWindow;
 }