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

1
docs/changes.txt
View File

@@ -616,6 +616,7 @@ wxMSW:
wxOSX: wxOSX:
- Compilation fix for wxWebView under 10.10.
- Fix conversion of wxBitmap to wxImage in 64 bit builds. - Fix conversion of wxBitmap to wxImage in 64 bit builds.
- Fix wxFileDialog::GetFilterIndex() for file open dialogs (phsilva). - Fix wxFileDialog::GetFilterIndex() for file open dialogs (phsilva).

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(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

@@ -158,7 +158,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.

24
src/osx/webview_webkit.mm
View File

@@ -296,7 +296,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
wxWebViewWebKit* webKitWindow; wxWebViewWebKit* webKitWindow;
} }
- initWithWxWindow: (wxWebViewWebKit*)inWindow; - (id)initWithWxWindow: (wxWebViewWebKit*)inWindow;
@end @end
@@ -305,7 +305,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
wxWebViewWebKit* webKitWindow; wxWebViewWebKit* webKitWindow;
} }
- initWithWxWindow: (wxWebViewWebKit*)inWindow; - (id)initWithWxWindow: (wxWebViewWebKit*)inWindow;
@end @end
@@ -314,7 +314,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
wxWebViewWebKit* webKitWindow; wxWebViewWebKit* webKitWindow;
} }
- initWithWxWindow: (wxWebViewWebKit*)inWindow; - (id)initWithWxWindow: (wxWebViewWebKit*)inWindow;
@end @end
@@ -442,7 +442,7 @@ void wxWebViewWebKit::GoBack()
if ( !m_webView ) if ( !m_webView )
return; return;
[(WebView*)m_webView goBack]; [m_webView goBack];
} }
void wxWebViewWebKit::GoForward() void wxWebViewWebKit::GoForward()
@@ -450,7 +450,7 @@ void wxWebViewWebKit::GoForward()
if ( !m_webView ) if ( !m_webView )
return; return;
[(WebView*)m_webView goForward]; [m_webView goForward];
} }
void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags) void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
@@ -849,7 +849,7 @@ void wxWebViewWebKit::Cut()
if ( !m_webView ) if ( !m_webView )
return; return;
[(WebView*)m_webView cut:m_webView]; [m_webView cut:m_webView];
} }
void wxWebViewWebKit::Copy() void wxWebViewWebKit::Copy()
@@ -857,7 +857,7 @@ void wxWebViewWebKit::Copy()
if ( !m_webView ) if ( !m_webView )
return; return;
[(WebView*)m_webView copy:m_webView]; [m_webView copy:m_webView];
} }
void wxWebViewWebKit::Paste() void wxWebViewWebKit::Paste()
@@ -865,7 +865,7 @@ void wxWebViewWebKit::Paste()
if ( !m_webView ) if ( !m_webView )
return; return;
[(WebView*)m_webView paste:m_webView]; [m_webView paste:m_webView];
} }
void wxWebViewWebKit::DeleteSelection() void wxWebViewWebKit::DeleteSelection()
@@ -873,7 +873,7 @@ void wxWebViewWebKit::DeleteSelection()
if ( !m_webView ) if ( !m_webView )
return; return;
[(WebView*)m_webView deleteSelection]; [m_webView deleteSelection];
} }
bool wxWebViewWebKit::HasSelection() const bool wxWebViewWebKit::HasSelection() const
@@ -1007,7 +1007,7 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
@implementation WebViewLoadDelegate @implementation WebViewLoadDelegate
- initWithWxWindow: (wxWebViewWebKit*)inWindow - (id)initWithWxWindow: (wxWebViewWebKit*)inWindow
{ {
[super init]; [super init];
webKitWindow = inWindow; // non retained webKitWindow = inWindow; // non retained
@@ -1197,7 +1197,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
@implementation WebViewPolicyDelegate @implementation WebViewPolicyDelegate
- initWithWxWindow: (wxWebViewWebKit*)inWindow - (id)initWithWxWindow: (wxWebViewWebKit*)inWindow
{ {
[super init]; [super init];
webKitWindow = inWindow; // non retained webKitWindow = inWindow; // non retained
@@ -1335,7 +1335,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
@implementation WebViewUIDelegate @implementation WebViewUIDelegate
- initWithWxWindow: (wxWebViewWebKit*)inWindow - (id)initWithWxWindow: (wxWebViewWebKit*)inWindow
{ {
[super init]; [super init];
webKitWindow = inWindow; // non retained webKitWindow = inWindow; // non retained