From b236f090ed76944de442c06ff7d13e7cf87d9a16 Mon Sep 17 00:00:00 2001 From: Steve Lamerton Date: Mon, 25 Jul 2011 13:55:54 +0000 Subject: [PATCH] Add support for EVT_WEB_VIEW_NEWWINDOW to the OSX WebKit backend. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/webview_webkit.mm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm index 59ede2dbb4..ec49602552 100644 --- a/src/osx/webview_webkit.mm +++ b/src/osx/webview_webkit.mm @@ -1170,7 +1170,6 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out) frame:(WebFrame *)frame decisionListener:(id)listener { - //wxUnusedVar(sender); wxUnusedVar(frame); wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end()); @@ -1201,8 +1200,17 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out) newFrameName:(NSString *)frameName decisionListener:(id < WebPolicyDecisionListener >)listener { - wxUnusedVar(sender); wxUnusedVar(actionInformation); + + 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); + + if (webKitWindow && webKitWindow->GetEventHandler()) + webKitWindow->GetEventHandler()->ProcessEvent(thisEvent); [listener ignore]; } -- 2.45.2