mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
60 lines
1.6 KiB
Diff
60 lines
1.6 KiB
Diff
|
diff --git a/include/wx/defs.h b/include/wx/defs.h
|
||
|
|
index 397ddd7..d128083 100644
|
||
|
|
--- a/include/wx/defs.h
|
||
|
|
+++ b/include/wx/defs.h
|
||
|
|
@@ -3169,12 +3169,20 @@ 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__ */
|
||
|
|
diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
|
||
|
|
index 8700367..f805099 100644
|
||
|
|
--- a/include/wx/html/webkit.h
|
||
|
|
+++ b/include/wx/html/webkit.h
|
||
|
|
@@ -18,7 +18,6 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#include "wx/control.h"
|
||
|
|
-DECLARE_WXCOCOA_OBJC_CLASS(WebView);
|
||
|
|
|
||
|
|
// ----------------------------------------------------------------------------
|
||
|
|
// Web Kit Control
|
||
|
|
@@ -107,7 +106,7 @@ private:
|
||
|
|
wxString m_currentURL;
|
||
|
|
wxString m_pageTitle;
|
||
|
|
|
||
|
|
- WX_WebView m_webView;
|
||
|
|
+ OSXWebViewPtr m_webView;
|
||
|
|
|
||
|
|
// we may use this later to setup our own mouse events,
|
||
|
|
// so leave it in for now.
|
||
|
|
diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
|
||
|
|
index 803f8b0..438e532 100644
|
||
|
|
--- a/include/wx/osx/webview_webkit.h
|
||
|
|
+++ b/include/wx/osx/webview_webkit.h
|
||
|
|
@@ -158,7 +158,7 @@ private:
|
||
|
|
wxWindowID m_windowID;
|
||
|
|
wxString m_pageTitle;
|
||
|
|
|
||
|
|
- wxObjCID m_webView;
|
||
|
|
+ OSXWebViewPtr m_webView;
|
||
|
|
|
||
|
|
// we may use this later to setup our own mouse events,
|
||
|
|
// so leave it in for now.
|