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

macos 10.15 build

Browse Source 
adapt to removed headers, add version defines
This commit is contained in:
Stefan Csomor
2019-08-07 12:05:13 +02:00
parent 88f04f551e
commit 0044bf4a7a
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/platform.h
View File

@@ -47,6 +47,12 @@
# ifndef MAC_OS_X_VERSION_10_13 # ifndef MAC_OS_X_VERSION_10_13
# define MAC_OS_X_VERSION_10_13 101300 # define MAC_OS_X_VERSION_10_13 101300
# endif # 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 # if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13
# ifndef NSAppKitVersionNumber10_10 # ifndef NSAppKitVersionNumber10_10
# define NSAppKitVersionNumber10_10 1343 # define NSAppKitVersionNumber10_10 1343

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

@@ -21,8 +21,10 @@
#include "wx/osx/private.h" #include "wx/osx/private.h"
#include <WebKit/WebKit.h> #include <WebKit/WebKit.h>
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_15
#include <WebKit/HIWebView.h> #include <WebKit/HIWebView.h>
#include <WebKit/CarbonUtils.h> #include <WebKit/CarbonUtils.h>
#endif
#include "wx/html/webkit.h" #include "wx/html/webkit.h"

6
src/osx/webview_webkit.mm
View File

@@ -33,8 +33,10 @@
#include <UIKit/UIWebView.h> #include <UIKit/UIWebView.h>
#else #else
#include <WebKit/WebKit.h> #include <WebKit/WebKit.h>
#include <WebKit/HIWebView.h> #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_15
#include <WebKit/CarbonUtils.h> #include <WebKit/HIWebView.h>
#include <WebKit/CarbonUtils.h>
#endif
#endif #endif
#include <Foundation/NSURLError.h> #include <Foundation/NSURLError.h>