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

Send correct navigation events when using SetPage on the IE backend, they now mimic Webkit.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-15 15:22:08 +00:00
parent c9ccc09c64
commit 442262d47a
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/msw/webview_ie.cpp
View File

@@ -127,17 +127,8 @@ void wxWebViewIE::LoadUrl(const wxString& url)
m_ie.CallMethod("Navigate", (BSTR) url.wc_str(), NULL, NULL, NULL, NULL); m_ie.CallMethod("Navigate", (BSTR) url.wc_str(), NULL, NULL, NULL, NULL);
} }
void wxWebViewIE::SetPage(const wxString& html, const wxString&) void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
{ {
LoadUrl("about:blank");
// Let the wx events generated for navigation events be processed, so
// that the underlying IE component completes its Document object.
// FIXME: calling wxYield is not elegant nor very reliable probably
wxYield();
// TODO: consider the "baseUrl" parameter if possible
// TODO: consider encoding
BSTR bstr = SysAllocString(html.wc_str()); BSTR bstr = SysAllocString(html.wc_str());
// Creates a new one-dimensional array // Creates a new one-dimensional array
@@ -145,16 +136,30 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString&)
if (psaStrings != NULL) if (psaStrings != NULL)
{ {
VARIANT *param; VARIANT *param;
HRESULT hr = SafeArrayAccessData(psaStrings, (LPVOID*)&param); HRESULT hr = SafeArrayAccessData(psaStrings, (LPVOID*)&param);
param->vt = VT_BSTR; param->vt = VT_BSTR;
param->bstrVal = bstr; param->bstrVal = bstr;
hr = SafeArrayUnaccessData(psaStrings); hr = SafeArrayUnaccessData(psaStrings);
IHTMLDocument2* document = GetDocument(); IHTMLDocument2* document = GetDocument();
document->write(psaStrings); document->write(psaStrings);
document->Release();
// SafeArrayDestroy calls SysFreeString for each BSTR // SafeArrayDestroy calls SysFreeString for each BSTR
SafeArrayDestroy(psaStrings); SafeArrayDestroy(psaStrings);
//We send the events when we are done to mimic webkit
//Navigated event
wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
GetId(), baseUrl, "", false);
event.SetEventObject(this);
HandleWindowEvent(event);
//Document complete event
event.SetEventType(wxEVT_COMMAND_WEB_VIEW_LOADED);
event.SetEventObject(this);
HandleWindowEvent(event);
} }
else else
{ {