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

Block new frames being created in wxWebViewIE, bringing it into line with the other ports. The existing code was mostly correct but a missing break in the switch caused many spurious events.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-05-19 20:14:27 +00:00
parent 70554c327e
commit be19c55608
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/webview.h
View File

@@ -290,8 +290,8 @@ public:
// provide a behavior consistent across ports. // provide a behavior consistent across ports.
// - OSX : I receive an event for new frames opened with HTML target, and // - OSX : I receive an event for new frames opened with HTML target, and
// currently block them all. // currently block them all.
// - IE : The DISPID_NEWWINDOW2 event looks like it should work, but I // - IE : An event is recieved for new frames and they are currently
// receive way too many of them. A new IE instance opens. // blocked
// - GTK : All frame open requests are blocked. A slot exists that I could // - GTK : All frame open requests are blocked. A slot exists that I could
// connect to to be notified if ever needed // connect to to be notified if ever needed

8
src/msw/webview_ie.cpp
View File

@@ -656,17 +656,15 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
{ {
m_canNavigateForward = enable; m_canNavigateForward = enable;
} }
break;
} }
/*
case DISPID_NEWWINDOW2: case DISPID_NEWWINDOW2:
//case DISPID_NEWWINDOW3:
{ {
wxLogMessage("DISPID_NEWWINDOW2\n");
wxActiveXEventNativeMSW* nativeParams = evt.GetNativeParameters(); wxActiveXEventNativeMSW* nativeParams = evt.GetNativeParameters();
// Cancel the attempt to open a new window // Cancel the attempt to open a new window
*V_BOOLREF(&nativeParams->pDispParams->rgvarg[0]) = VARIANT_TRUE; *V_BOOLREF(&nativeParams->pDispParams->rgvarg[0]) = VARIANT_TRUE;
}*/ break;
}
} }
evt.Skip(); evt.Skip();