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

Fix compilation of wxWebView under mingw by adding missing definitions and dynamically loading urlmon.

Browse Source 
Fixes #13509

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-09-28 14:54:56 +00:00
parent 5223261db4
commit e924e848f7
3 changed files with 136 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/msw/webview_ie.cpp
View File

@@ -26,12 +26,10 @@
#include "wx/msw/registry.h"
#include "wx/msw/missing.h"
#include "wx/filesys.h"
#include "wx/dynlib.h"
wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView);
//We link to urlmon as it is required for CoInternetGetSession
#pragma comment(lib, "urlmon")
BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
EVT_ERASE_BACKGROUND(wxWebViewIE::onEraseBg)
@@ -82,7 +80,7 @@ bool wxWebViewIE::Create(wxWindow* parent,
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());
}
void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
@@ -667,17 +665,29 @@ void wxWebViewIE::RunScript(const wxString& javascript)
void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
{
ClassFactory* cf = new ClassFactory(handler);
IInternetSession* session;
if(FAILED(CoInternetGetSession(0, &session, 0)))
wxDynamicLibrary urlMon(wxT("urlmon.dll"));
if(urlMon.HasSymbol(wxT("CoInternetGetSession")))
{
wxFAIL_MSG("Could not retrive internet session");
}
typedef HRESULT (WINAPI *CoInternetGetSession_t)(DWORD, IInternetSession**, DWORD);
wxDYNLIB_FUNCTION(CoInternetGetSession_t, CoInternetGetSession, urlMon);
HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, handler->GetName(), 0, NULL, 0);
if(FAILED(hr))
ClassFactory* cf = new ClassFactory(handler);
IInternetSession* session;
HRESULT res = (*pfnCoInternetGetSession)(0, &session, 0);
if(FAILED(res))
{
wxFAIL_MSG("Could not retrive internet session");
}
HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, handler->GetName(), 0, NULL, 0);
if(FAILED(hr))
{
wxFAIL_MSG("Could not register protocol");
}
}
else
{
wxFAIL_MSG("Could not register protocol");
wxFAIL_MSG("urlmon does not contain CoInternetGetSession");
}
}