#include "wx/msw/missing.h"
#include "wx/filesys.h"
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView);
+
//We link to urlmon as it is required for CoInternetGetSession
#pragma comment(lib, "urlmon")
SetBackgroundStyle(wxBG_STYLE_PAINT);
SetDoubleBuffered(true);
- LoadUrl(url);
+ LoadURL(url);
return true;
}
-void wxWebViewIE::LoadUrl(const wxString& url)
+void wxWebViewIE::LoadURL(const wxString& url)
{
m_ie.CallMethod("Navigate", (BSTR) url.wc_str(), NULL, NULL, NULL, NULL);
}
//We send the events when we are done to mimic webkit
//Navigated event
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
- GetId(), baseUrl, "", false);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+ GetId(), baseUrl, "");
event.SetEventObject(this);
HandleWindowEvent(event);
}
-wxString wxWebViewIE::GetPageSource()
+wxString wxWebViewIE::GetPageSource() const
{
IHTMLDocument2* document = GetDocument();
IHTMLElement *bodyTag = NULL;
return source;
}
-wxWebViewZoom wxWebViewIE::GetZoom()
+wxWebViewZoom wxWebViewIE::GetZoom() const
{
if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
return GetIEOpticalZoom();
wxASSERT(result == S_OK);
}
-wxWebViewZoom wxWebViewIE::GetIETextZoom()
+wxWebViewZoom wxWebViewIE::GetIETextZoom() const
{
VARIANT zoomVariant;
VariantInit (&zoomVariant);
wxASSERT(result == S_OK);
}
-wxWebViewZoom wxWebViewIE::GetIEOpticalZoom()
+wxWebViewZoom wxWebViewIE::GetIEOpticalZoom() const
{
VARIANT zoomVariant;
VariantInit (&zoomVariant);
OLECMDEXECOPT_DODEFAULT, NULL, NULL);
}
-bool wxWebViewIE::CanGoBack()
+bool wxWebViewIE::CanGoBack() const
{
if(m_historyEnabled)
return m_historyPosition > 0;
return false;
}
-bool wxWebViewIE::CanGoForward()
+bool wxWebViewIE::CanGoForward() const
{
if(m_historyEnabled)
return m_historyPosition != static_cast<int>(m_historyList.size()) - 1;
return false;
}
-void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
{
int pos = -1;
for(unsigned int i = 0; i < m_historyList.size(); i++)
wxASSERT_MSG(pos != static_cast<int>(m_historyList.size()),
"invalid history item");
m_historyLoadingFromList = true;
- LoadUrl(item->GetUrl());
+ LoadURL(item->GetUrl());
m_historyPosition = pos;
}
-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetBackwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewIE::GetBackwardHistory()
{
- wxVector<wxSharedPtr<wxWebHistoryItem> > backhist;
+ wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;
//As we don't have std::copy or an iterator constructor in the wxwidgets
//native vector we construct it by hand
for(int i = 0; i < m_historyPosition; i++)
return backhist;
}
-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetForwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewIE::GetForwardHistory()
{
- wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist;
+ wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;
//As we don't have std::copy or an iterator constructor in the wxwidgets
//native vector we construct it by hand
for(int i = m_historyPosition + 1; i < static_cast<int>(m_historyList.size()); i++)
wxASSERT(success);
}
-bool wxWebViewIE::IsBusy()
-{
+bool wxWebViewIE::IsBusy() const
+{
if (m_isBusy) return true;
wxVariant out = m_ie.GetProperty("Busy");
return out.GetBool();
}
-wxString wxWebViewIE::GetCurrentURL()
+wxString wxWebViewIE::GetCurrentURL() const
{
wxVariant out = m_ie.GetProperty("LocationURL");
return out.GetString();
}
-wxString wxWebViewIE::GetCurrentTitle()
+wxString wxWebViewIE::GetCurrentTitle() const
{
IHTMLDocument2* document = GetDocument();
BSTR title;
return wxString(title);
}
-bool wxWebViewIE::CanCut()
+bool wxWebViewIE::CanCut() const
{
return CanExecCommand("Cut");
}
-bool wxWebViewIE::CanCopy()
+bool wxWebViewIE::CanCopy() const
{
return CanExecCommand("Copy");
}
-bool wxWebViewIE::CanPaste()
+bool wxWebViewIE::CanPaste() const
{
return CanExecCommand("Paste");
}
ExecCommand("Paste");
}
-bool wxWebViewIE::CanUndo()
+bool wxWebViewIE::CanUndo() const
{
return CanExecCommand("Undo");
}
-bool wxWebViewIE::CanRedo()
+bool wxWebViewIE::CanRedo() const
{
return CanExecCommand("Redo");
}
document->Release();
}
-bool wxWebViewIE::IsEditable()
+bool wxWebViewIE::IsEditable() const
{
IHTMLDocument2* document = GetDocument();
BSTR mode;
ExecCommand("SelectAll");
}
-bool wxWebViewIE::HasSelection()
+bool wxWebViewIE::HasSelection() const
{
IHTMLDocument2* document = GetDocument();
IHTMLSelectionObject* selection;
ExecCommand("Delete");
}
-wxString wxWebViewIE::GetSelectedText()
+wxString wxWebViewIE::GetSelectedText() const
{
IHTMLDocument2* document = GetDocument();
IHTMLSelectionObject* selection;
return selected;
}
-wxString wxWebViewIE::GetSelectedSource()
+wxString wxWebViewIE::GetSelectedSource() const
{
IHTMLDocument2* document = GetDocument();
IHTMLSelectionObject* selection;
document->Release();
}
-wxString wxWebViewIE::GetPageText()
+wxString wxWebViewIE::GetPageText() const
{
IHTMLDocument2* document = GetDocument();
wxString text;
document->Release();
}
-void wxWebViewIE::RegisterProtocol(wxWebProtocolHandler* handler)
+void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
{
ClassFactory* cf = new ClassFactory(handler);
IInternetSession* session;
wxFAIL_MSG("Could not retrive internet session");
}
- HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, handler->GetProtocol(), 0, NULL, 0);
+ HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, handler->GetName(), 0, NULL, 0);
if(FAILED(hr))
{
wxFAIL_MSG("Could not register protocol");
}
}
-bool wxWebViewIE::CanExecCommand(wxString command)
+bool wxWebViewIE::CanExecCommand(wxString command) const
{
IHTMLDocument2* document = GetDocument();
VARIANT_BOOL enabled;
document->Release();
}
-IHTMLDocument2* wxWebViewIE::GetDocument()
+IHTMLDocument2* wxWebViewIE::GetDocument() const
{
wxVariant variant = m_ie.GetProperty("Document");
IHTMLDocument2* document = (IHTMLDocument2*)variant.GetVoidPtr();
wxString url = evt[1].GetString();
wxString target = evt[3].GetString();
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
- GetId(), url, target, true);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+ GetId(), url, target);
event.SetEventObject(this);
HandleWindowEvent(event);
- if (event.IsVetoed())
+ if (!event.IsAllowed())
{
wxActiveXEventNativeMSW* nativeParams =
evt.GetNativeParameters();
wxString url = evt[1].GetString();
// TODO: set target parameter if possible
wxString target = wxEmptyString;
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
- GetId(), url, target, false);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+ GetId(), url, target);
event.SetEventObject(this);
HandleWindowEvent(event);
break;
//As we are complete we also add to the history list, but not if the
//page is not the main page, ie it is a subframe
- if(m_historyEnabled && !m_historyLoadingFromList && url == GetCurrentURL())
+ //We also have to check if we are loading a file:// url, if so we
+ //need to change the comparison as ie passes back a different style
+ //of url
+ if(m_historyEnabled && !m_historyLoadingFromList &&
+ (url == GetCurrentURL() ||
+ (GetCurrentURL().substr(0, 4) == "file" &&
+ wxFileSystem::URLToFileName(GetCurrentURL()).GetFullPath() == url)))
{
//If we are not at the end of the list, then erase everything
//between us and the end before adding the new page
m_historyList.erase(m_historyList.begin() + m_historyPosition + 1,
m_historyList.end());
}
- wxSharedPtr<wxWebHistoryItem> item(new wxWebHistoryItem(url, GetCurrentTitle()));
+ wxSharedPtr<wxWebViewHistoryItem> item(new wxWebViewHistoryItem(url, GetCurrentTitle()));
m_historyList.push_back(item);
m_historyPosition++;
}
m_historyLoadingFromList = false;
// TODO: set target parameter if possible
wxString target = wxEmptyString;
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
- url, target, false);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
+ url, target);
event.SetEventObject(this);
HandleWindowEvent(event);
break;
{
wxString title = evt[0].GetString();
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
- GetId(), GetCurrentURL(), wxEmptyString, true);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+ GetId(), GetCurrentURL(), "");
event.SetString(title);
event.SetEventObject(this);
HandleWindowEvent(event);
case DISPID_NAVIGATEERROR:
{
- wxWebNavigationError errorType = wxWEB_NAV_ERR_OTHER;
+ wxWebViewNavigationError errorType = wxWEB_NAV_ERR_OTHER;
wxString errorCode = "?";
switch (evt[3].GetLong())
{
wxString url = evt[1].GetString();
wxString target = evt[2].GetString();
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
- url, target, false);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
+ url, target);
event.SetEventObject(this);
event.SetInt(errorType);
event.SetString(errorCode);
{
wxString url = evt[4].GetString();
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
- GetId(), url, wxEmptyString, true);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+ GetId(), url, wxEmptyString);
event.SetEventObject(this);
HandleWindowEvent(event);
evt.Skip();
}
-VirtualProtocol::VirtualProtocol(wxWebProtocolHandler *handler)
+VirtualProtocol::VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler)
{
m_refCount = 0;
m_file = NULL;
AddRef();
return S_OK;
}
- else if(riid == IID_IInternetProtocolInfo)
- {
- *ppvObject = (IInternetProtocolInfo*)this;
- AddRef();
- return S_OK;
- }
else
{
*ppvObject = NULL;
}
}
-HRESULT VirtualProtocol::CombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl,
- DWORD dwCombineFlags, LPWSTR pwzResult,
- DWORD cchResult, DWORD *pcchResult,
- DWORD dwReserved)
-{
- wxString newuri = m_handler->CombineURIs(pwzBaseUrl, pwzRelativeUrl);
- //Check the buffer we are given can hold the new urll
- if(wxStrlen(newuri) > cchResult)
- return S_FALSE;
-
- wxStrcpy(pwzResult, newuri.c_str());
- *pcchResult = wxStrlen(newuri);
- return S_OK;
-}
-
-HRESULT VirtualProtocol::ParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction,
- DWORD dwParseFlags, LPWSTR pwzResult,
- DWORD cchResult, DWORD *pcchResult,
- DWORD dwReserved)
-{
- //return INET_E_DEFAULT_ACTION;
- wxStrcpy(pwzResult, pwzUrl);
- *pcchResult = wxStrlen(pwzResult);
- return S_OK;
-}
-
-HRESULT VirtualProtocol::QueryInfo(LPCWSTR pwzUrl, QUERYOPTION OueryOption,
- DWORD dwQueryFlags, LPVOID pBuffer,
- DWORD cbBuffer, DWORD *pcbBuf,
- DWORD dwReserved)
-{
- return INET_E_DEFAULT_ACTION;
-}
-
HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
void ** ppvObject)
{
projects / wxWidgets.git / blobdiff