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

using proper types for webkit variants, see #16329

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2014-06-20 08:14:46 +00:00
parent 1ab459b212
commit 1a5b712103
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/defs.h
View File

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

3
include/wx/html/webkit.h
View File

@@ -18,7 +18,6 @@
#endif #endif
#include "wx/control.h" #include "wx/control.h"
DECLARE_WXCOCOA_OBJC_CLASS(WebView);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Web Kit Control // Web Kit Control
@@ -107,7 +106,7 @@ private:
wxString m_currentURL; wxString m_currentURL;
wxString m_pageTitle; wxString m_pageTitle;
WX_WebView m_webView; OSXWebViewPtr m_webView;
// we may use this later to setup our own mouse events, // we may use this later to setup our own mouse events,
// so leave it in for now. // so leave it in for now.

2
include/wx/osx/webview_webkit.h
View File

@@ -157,7 +157,7 @@ private:
wxWindowID m_windowID; wxWindowID m_windowID;
wxString m_pageTitle; wxString m_pageTitle;
wxObjCID m_webView; OSXWebViewPtr m_webView;
// we may use this later to setup our own mouse events, // we may use this later to setup our own mouse events,
// so leave it in for now. // so leave it in for now.

21
src/osx/webview_webkit.mm
View File

@@ -40,15 +40,6 @@
// using native types to get compile errors and warnings // using native types to get compile errors and warnings
#if wxOSX_USE_COCOA_OR_CARBON
typedef WebView OSXWebView;
#elif wxOSX_USE_IPHONE
typedef UIWebView OSXWebView;
#else
#error "unsupport OSX variant"
#endif
#define DEBUG_WEBKIT_SIZING 0 #define DEBUG_WEBKIT_SIZING 0
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -467,7 +458,7 @@ void wxWebViewWebKit::GoBack()
if ( !m_webView ) if ( !m_webView )
return; return;
[(OSXWebView*)m_webView goBack]; [m_webView goBack];
} }
void wxWebViewWebKit::GoForward() void wxWebViewWebKit::GoForward()
@@ -475,7 +466,7 @@ void wxWebViewWebKit::GoForward()
if ( !m_webView ) if ( !m_webView )
return; return;
[(OSXWebView*)m_webView goForward]; [m_webView goForward];
} }
void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags) void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
@@ -874,7 +865,7 @@ void wxWebViewWebKit::Cut()
if ( !m_webView ) if ( !m_webView )
return; return;
[(OSXWebView*)m_webView cut:m_webView]; [m_webView cut:m_webView];
} }
void wxWebViewWebKit::Copy() void wxWebViewWebKit::Copy()
@@ -882,7 +873,7 @@ void wxWebViewWebKit::Copy()
if ( !m_webView ) if ( !m_webView )
return; return;
[(OSXWebView*)m_webView copy:m_webView]; [m_webView copy:m_webView];
} }
void wxWebViewWebKit::Paste() void wxWebViewWebKit::Paste()
@@ -890,7 +881,7 @@ void wxWebViewWebKit::Paste()
if ( !m_webView ) if ( !m_webView )
return; return;
[(OSXWebView*)m_webView paste:m_webView]; [m_webView paste:m_webView];
} }
void wxWebViewWebKit::DeleteSelection() void wxWebViewWebKit::DeleteSelection()
@@ -898,7 +889,7 @@ void wxWebViewWebKit::DeleteSelection()
if ( !m_webView ) if ( !m_webView )
return; return;
[(OSXWebView*)m_webView deleteSelection]; [m_webView deleteSelection];
} }
bool wxWebViewWebKit::HasSelection() const bool wxWebViewWebKit::HasSelection() const