From fdc255cfe0f2689f567a97a254967a47a0ac4482 Mon Sep 17 00:00:00 2001 From: Steve Lamerton Date: Mon, 1 Aug 2011 17:41:14 +0000 Subject: [PATCH 1/1] Fix compilation for OSX backend. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/webhistoryitem_webkit.h | 3 ++- include/wx/osx/webview_webkit.h | 3 ++- src/osx/webview_webkit.mm | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/wx/osx/webhistoryitem_webkit.h b/include/wx/osx/webhistoryitem_webkit.h index aaec1848c7..44e7be50c5 100644 --- a/include/wx/osx/webhistoryitem_webkit.h +++ b/include/wx/osx/webhistoryitem_webkit.h @@ -12,7 +12,8 @@ #include "wx/setup.h" -#if wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__) +#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \ + || defined(__WXOSX_CARBON__)) class WXDLLIMPEXP_WEB wxWebHistoryItem { diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h index e83b1ccdb5..59d8ae1dbd 100644 --- a/include/wx/osx/webview_webkit.h +++ b/include/wx/osx/webview_webkit.h @@ -15,7 +15,8 @@ #include "wx/setup.h" -#if wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__) +#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \ + || defined(__WXOSX_CARBON__)) #include "wx/control.h" #include "wx/webview.h" diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm index 0be86709bc..9323cc563a 100644 --- a/src/osx/webview_webkit.mm +++ b/src/osx/webview_webkit.mm @@ -14,6 +14,9 @@ #include "wx/osx/webview_webkit.h" +#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \ + || defined(__WXOSX_CARBON__)) + // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -21,8 +24,6 @@ #include "wx/wx.h" #endif -//#if wxHAVE_WEB_BACKEND_OSX_WEBKIT - #ifdef __WXCOCOA__ #include "wx/cocoa/autorelease.h" #else @@ -45,7 +46,7 @@ std::map wx_webviewctrls; // macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxControl) +wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView); BEGIN_EVENT_TABLE(wxWebViewWebKit, wxControl) #if defined(__WXMAC__) && wxOSX_USE_CARBON @@ -1194,10 +1195,9 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out) wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end()); NSString *url = [[request URL] absoluteString]; - wxString target = wxStringWithNSString([frame name]); wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wx_webviewctrls[sender]->GetId(), - wxStringWithNSString( url ), target, true); + wxStringWithNSString( url ), "", true); if (webKitWindow && webKitWindow->GetEventHandler()) webKitWindow->GetEventHandler()->ProcessEvent(thisEvent); @@ -1206,4 +1206,4 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out) } @end -//#endif //wxHAVE_WEB_BACKEND_OSX_WEBKIT +#endif //wxUSE_WEBVIEW_WEBKIT -- 2.45.2