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

Update handling and documentation for new window events. Clarify that you must handle the event if you require an action, the default is for nothing to happen.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-25 13:23:05 +00:00
parent 205defae89
commit d676fb218d
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/webview_ie.cpp
View File

@@ -956,12 +956,10 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
event.SetEventObject(this);
HandleWindowEvent(event);
//If we veto the event then we cancel the new window
if (event.IsVetoed())
{
wxActiveXEventNativeMSW* nativeParams = evt.GetNativeParameters();
*V_BOOLREF(&nativeParams->pDispParams->rgvarg[3]) = VARIANT_TRUE;
}
//We always cancel this event otherwise an Internet Exporer window
//is opened for the url
wxActiveXEventNativeMSW* nativeParams = evt.GetNativeParameters();
*V_BOOLREF(&nativeParams->pDispParams->rgvarg[3]) = VARIANT_TRUE;
break;
}
}