at v192 1.7 kB view raw
1diff --git a/include/wx/defs.h b/include/wx/defs.h 2index 397ddd7..d128083 100644 3--- a/include/wx/defs.h 4+++ b/include/wx/defs.h 5@@ -3169,12 +3169,20 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIImage); 6 DECLARE_WXCOCOA_OBJC_CLASS(UIEvent); 7 DECLARE_WXCOCOA_OBJC_CLASS(NSSet); 8 DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext); 9+DECLARE_WXCOCOA_OBJC_CLASS(UIWebView); 10 11 typedef WX_UIWindow WXWindow; 12 typedef WX_UIView WXWidget; 13 typedef WX_EAGLContext WXGLContext; 14 typedef WX_NSString* WXGLPixelFormat; 15 16+typedef WX_UIWebView OSXWebViewPtr; 17+ 18+#endif 19+ 20+#if wxOSX_USE_COCOA_OR_CARBON 21+DECLARE_WXCOCOA_OBJC_CLASS(WebView); 22+typedef WX_WebView OSXWebViewPtr; 23 #endif 24 25 #endif /* __WXMAC__ */ 26diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h 27index 8700367..f805099 100644 28--- a/include/wx/html/webkit.h 29+++ b/include/wx/html/webkit.h 30@@ -18,7 +18,6 @@ 31 #endif 32 33 #include "wx/control.h" 34-DECLARE_WXCOCOA_OBJC_CLASS(WebView); 35 36 // ---------------------------------------------------------------------------- 37 // Web Kit Control 38@@ -107,7 +106,7 @@ private: 39 wxString m_currentURL; 40 wxString m_pageTitle; 41 42- WX_WebView m_webView; 43+ OSXWebViewPtr m_webView; 44 45 // we may use this later to setup our own mouse events, 46 // so leave it in for now. 47diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h 48index 803f8b0..438e532 100644 49--- a/include/wx/osx/webview_webkit.h 50+++ b/include/wx/osx/webview_webkit.h 51@@ -158,7 +158,7 @@ private: 52 wxWindowID m_windowID; 53 wxString m_pageTitle; 54 55- wxObjCID m_webView; 56+ OSXWebViewPtr m_webView; 57 58 // we may use this later to setup our own mouse events, 59 // so leave it in for now.