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

Fix wxOSX build under 10.10.

Browse Source 
Use proper types for webkit variants.

Closes #16329.
This commit is contained in:
Stefan Csomor
2014-06-20 08:14:46 +00:00
committed by Vadim Zeitlin
parent 41e459627e
commit 2a13ad64d8
5 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/defs.h
View File

@@ -3169,14 +3169,22 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIImage);
DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
DECLARE_WXCOCOA_OBJC_CLASS(UIWebView);
typedef WX_UIWindow WXWindow;
typedef WX_UIView WXWidget;
typedef WX_EAGLContext WXGLContext;
typedef WX_NSString* WXGLPixelFormat;
typedef WX_UIWebView OSXWebViewPtr;
#endif
#if wxOSX_USE_COCOA_OR_CARBON
DECLARE_WXCOCOA_OBJC_CLASS(WebView);
typedef WX_WebView OSXWebViewPtr;
#endif
#endif /* __WXMAC__ */
/* ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port */