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

14
interface/wx/webview.h
View File

@@ -155,8 +155,8 @@ public:
precise error message/code.
@event{EVT_WEB_VIEW_NEWWINDOW(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_NEWWINDOW event, generated when a new
window is created. This event may be vetoed to prevent a new window showing,
for example if you want to open the url in the existing window or a new tab.
window is created. You must handle this event if you want anything to
happen, for example to load the page in a new window or tab.
@endEventTable
@library{wxweb}
@@ -519,8 +519,8 @@ public:
precise error message/code.
@event{EVT_WEB_VIEW_NEWWINDOW(id, func)}
Process a @c wxEVT_COMMAND_WEB_VIEW_NEWWINDOW event, generated when a new
window is created. This event may be vetoed to prevent a new window showing,
for example if you want to open the url in the existing window or a new tab.
window is created. You must handle this event if you want anything to
happen, for example to load the page in a new window or tab.
@endEventTable
@library{wxweb}
@@ -549,8 +549,7 @@ public:
/**
Get whether this event may be vetoed (stopped/prevented). Only
meaningful for events fired before navigation takes place or new
window events.
meaningful for events fired before navigation takes place.
*/
bool CanVeto() const;
@@ -562,8 +561,7 @@ public:
/**
Veto (prevent/stop) this event. Only meaningful for events fired
before navigation takes place or new window events. Only valid
if CanVeto() returned true.
before navigation takes place. Only valid if CanVeto() returned true.
*/
void Veto();
};

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;
}
}