From 0044bf4a7af60a46a8b2ab2a8514ce298ff0fadf Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 7 Aug 2019 12:05:13 +0200
Subject: [PATCH] macos 10.15 build

adapt to removed headers, add version defines
---
 include/wx/platform.h              | 6 ++++++
 src/html/htmlctrl/webkit/webkit.mm | 2 ++
 src/osx/webview_webkit.mm          | 6 ++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 91749a1c8b..d100c2b7ab 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -47,6 +47,12 @@
 #    ifndef MAC_OS_X_VERSION_10_13
 #       define MAC_OS_X_VERSION_10_13 101300
 #    endif
+#    ifndef MAC_OS_X_VERSION_10_14
+#       define MAC_OS_X_VERSION_10_14 101400
+#    endif
+#    ifndef MAC_OS_X_VERSION_10_15
+#       define MAC_OS_X_VERSION_10_15 101500
+#    endif
 #    if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13
 #        ifndef NSAppKitVersionNumber10_10
 #            define NSAppKitVersionNumber10_10 1343
diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index e9a8742a45..41334ea13d 100644
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -21,8 +21,10 @@
 #include "wx/osx/private.h"
 
 #include <WebKit/WebKit.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_15
 #include <WebKit/HIWebView.h>
 #include <WebKit/CarbonUtils.h>
+#endif
 
 #include "wx/html/webkit.h"
 
diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index f818b090f5..381d0f3330 100644
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -33,8 +33,10 @@
 #include <UIKit/UIWebView.h>
 #else
 #include <WebKit/WebKit.h>
-#include <WebKit/HIWebView.h>
-#include <WebKit/CarbonUtils.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_15
+  #include <WebKit/HIWebView.h>
+  #include <WebKit/CarbonUtils.h>
+#endif
 #endif
 #include <Foundation/NSURLError.h>