#include "wx/msw/webview_ie.h"
-#if wxUSE_WEBVIEW_IE
+#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE
#include <olectl.h>
#include <oleidl.h>
#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)
return true;
}
+wxWebViewIE::~wxWebViewIE()
+{
+ for(unsigned int i = 0; i < m_factories.size(); i++)
+ {
+ m_factories[i]->Release();
+ }
+}
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)
//We send the events when we are done to mimic webkit
//Navigated event
wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
- GetId(), baseUrl, "", false);
+ GetId(), baseUrl, "");
event.SetEventObject(this);
HandleWindowEvent(event);
wxWebViewZoom wxWebViewIE::GetZoom() const
{
- if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
- return GetIEOpticalZoom();
- else if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT)
- return GetIETextZoom();
- else
- wxFAIL;
+ switch( m_zoomType )
+ {
+ case wxWEB_VIEW_ZOOM_TYPE_LAYOUT:
+ return GetIEOpticalZoom();
+ case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+ return GetIETextZoom();
+ default:
+ wxFAIL;
+ }
//Dummy return to stop compiler warnings
return wxWEB_VIEW_ZOOM_MEDIUM;
void wxWebViewIE::SetZoom(wxWebViewZoom zoom)
{
- if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
- SetIEOpticalZoom(zoom);
- else if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT)
- SetIETextZoom(zoom);
- else
- wxFAIL;
+ switch( m_zoomType )
+ {
+ case wxWEB_VIEW_ZOOM_TYPE_LAYOUT:
+ SetIEOpticalZoom(zoom);
+ break;
+ case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+ SetIETextZoom(zoom);
+ break;
+ default:
+ wxFAIL;
+ }
}
void wxWebViewIE::SetIETextZoom(wxWebViewZoom level)
V_VT(&zoomVariant) = VT_I4;
V_I4(&zoomVariant) = level;
- HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
- OLECMDEXECOPT_DONTPROMPTUSER,
- &zoomVariant, NULL);
+#if wxDEBUG_LEVEL
+ HRESULT result =
+#endif
+ m_webBrowser->ExecWB(OLECMDID_ZOOM,
+ OLECMDEXECOPT_DONTPROMPTUSER,
+ &zoomVariant, NULL);
wxASSERT(result == S_OK);
}
VariantInit (&zoomVariant);
V_VT(&zoomVariant) = VT_I4;
- HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
- OLECMDEXECOPT_DONTPROMPTUSER,
- NULL, &zoomVariant);
+#if wxDEBUG_LEVEL
+ HRESULT result =
+#endif
+ m_webBrowser->ExecWB(OLECMDID_ZOOM,
+ OLECMDEXECOPT_DONTPROMPTUSER,
+ NULL, &zoomVariant);
wxASSERT(result == S_OK);
//We can safely cast here as we know that the range matches our enum
wxFAIL;
}
- HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
- OLECMDEXECOPT_DODEFAULT,
- &zoomVariant,
- NULL);
+#if wxDEBUG_LEVEL
+ HRESULT result =
+#endif
+ m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,
+ OLECMDEXECOPT_DODEFAULT,
+ &zoomVariant,
+ NULL);
wxASSERT(result == S_OK);
}
VariantInit (&zoomVariant);
V_VT(&zoomVariant) = VT_I4;
- HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
- OLECMDEXECOPT_DODEFAULT, NULL,
- &zoomVariant);
+#if wxDEBUG_LEVEL
+ HRESULT result =
+#endif
+ m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,
+ OLECMDEXECOPT_DODEFAULT, NULL,
+ &zoomVariant);
wxASSERT(result == S_OK);
const int zoom = V_I4(&zoomVariant);
{
// FIXME: the wxWidgets docs do not really document what the return
// parameter of PutProperty is
- const bool success = m_ie.PutProperty("Offline", (offline ?
- VARIANT_TRUE :
- VARIANT_FALSE));
+#if wxDEBUG_LEVEL
+ const bool success =
+#endif
+ m_ie.PutProperty("Offline", (offline ?
+ VARIANT_TRUE :
+ VARIANT_FALSE));
wxASSERT(success);
}
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");
+ }
+ m_factories.push_back(cf);
+ }
+ else
{
- wxFAIL_MSG("Could not register protocol");
+ wxFAIL_MSG("urlmon does not contain CoInternetGetSession");
}
}
wxString target = evt[3].GetString();
wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
- GetId(), url, target, true);
+ GetId(), url, target);
event.SetEventObject(this);
HandleWindowEvent(event);
- if (event.IsVetoed())
+ if (!event.IsAllowed())
{
wxActiveXEventNativeMSW* nativeParams =
evt.GetNativeParameters();
// TODO: set target parameter if possible
wxString target = wxEmptyString;
wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
- GetId(), url, target, false);
+ GetId(), url, target);
event.SetEventObject(this);
HandleWindowEvent(event);
break;
// TODO: set target parameter if possible
wxString target = wxEmptyString;
wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
- url, target, false);
+ url, target);
event.SetEventObject(this);
HandleWindowEvent(event);
break;
wxString title = evt[0].GetString();
wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
- GetId(), GetCurrentURL(), wxEmptyString, true);
+ GetId(), GetCurrentURL(), "");
event.SetString(title);
event.SetEventObject(this);
HandleWindowEvent(event);
wxString url = evt[1].GetString();
wxString target = evt[2].GetString();
wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
- url, target, false);
+ url, target);
event.SetEventObject(this);
event.SetInt(errorType);
event.SetString(errorCode);
wxString url = evt[4].GetString();
wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
- GetId(), url, wxEmptyString, true);
+ GetId(), url, wxEmptyString);
event.SetEventObject(this);
HandleWindowEvent(event);
}
-#endif
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE
projects / wxWidgets.git / blobdiff