No changes, just remove extra whitespace from wxWebViewIE code.
Closes #13678. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -274,7 +274,7 @@ private:
|
|||||||
* Busy property is false but should be true.
|
* Busy property is false but should be true.
|
||||||
*/
|
*/
|
||||||
bool m_isBusy;
|
bool m_isBusy;
|
||||||
//We manage our own history, the history list contains the history items
|
//We manage our own history, the history list contains the history items
|
||||||
//which are added as documentcomplete events arrive, unless we are loading
|
//which are added as documentcomplete events arrive, unless we are loading
|
||||||
//an item from the history. The position is stored as an int, and reflects
|
//an item from the history. The position is stored as an int, and reflects
|
||||||
//where we are in the history list.
|
//where we are in the history list.
|
||||||
@@ -313,27 +313,27 @@ public:
|
|||||||
ULONG STDMETHODCALLTYPE Release();
|
ULONG STDMETHODCALLTYPE Release();
|
||||||
|
|
||||||
//IInternetProtocolRoot
|
//IInternetProtocolRoot
|
||||||
HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason),
|
HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason),
|
||||||
DWORD WXUNUSED(dwOptions))
|
DWORD WXUNUSED(dwOptions))
|
||||||
{ return E_NOTIMPL; }
|
{ return E_NOTIMPL; }
|
||||||
HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData))
|
HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData))
|
||||||
{ return S_OK; }
|
{ return S_OK; }
|
||||||
HRESULT STDMETHODCALLTYPE Resume() { return S_OK; }
|
HRESULT STDMETHODCALLTYPE Resume() { return S_OK; }
|
||||||
HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl,
|
HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl,
|
||||||
wxIInternetProtocolSink *pOIProtSink,
|
wxIInternetProtocolSink *pOIProtSink,
|
||||||
wxIInternetBindInfo *pOIBindInfo,
|
wxIInternetBindInfo *pOIBindInfo,
|
||||||
DWORD grfPI,
|
DWORD grfPI,
|
||||||
HANDLE_PTR dwReserved);
|
HANDLE_PTR dwReserved);
|
||||||
HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; }
|
HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; }
|
||||||
HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; }
|
HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; }
|
||||||
|
|
||||||
//IInternetProtocol
|
//IInternetProtocol
|
||||||
HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions))
|
HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions))
|
||||||
{ return S_OK; }
|
{ return S_OK; }
|
||||||
HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead);
|
HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead);
|
||||||
HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove),
|
HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove),
|
||||||
DWORD WXUNUSED(dwOrigin),
|
DWORD WXUNUSED(dwOrigin),
|
||||||
ULARGE_INTEGER* WXUNUSED(plibNewPosition))
|
ULARGE_INTEGER* WXUNUSED(plibNewPosition))
|
||||||
{ return E_FAIL; }
|
{ return E_FAIL; }
|
||||||
HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; }
|
HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; }
|
||||||
};
|
};
|
||||||
@@ -348,7 +348,7 @@ public:
|
|||||||
ULONG STDMETHODCALLTYPE Release();
|
ULONG STDMETHODCALLTYPE Release();
|
||||||
|
|
||||||
//IClassFactory
|
//IClassFactory
|
||||||
HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter,
|
HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter,
|
||||||
REFIID riid, void** ppvObject);
|
REFIID riid, void** ppvObject);
|
||||||
HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
|
HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
|
||||||
private:
|
private:
|
||||||
|
@@ -472,7 +472,7 @@ void wxWebViewIE::SetOfflineMode(bool offline)
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool wxWebViewIE::IsBusy() const
|
bool wxWebViewIE::IsBusy() const
|
||||||
{
|
{
|
||||||
if (m_isBusy) return true;
|
if (m_isBusy) return true;
|
||||||
|
|
||||||
wxVariant out = m_ie.GetProperty("Busy");
|
wxVariant out = m_ie.GetProperty("Busy");
|
||||||
@@ -834,12 +834,12 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
|
|||||||
|
|
||||||
//As we are complete we also add to the history list, but not if the
|
//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
|
//page is not the main page, ie it is a subframe
|
||||||
//We also have to check if we are loading a file:// url, if so we
|
//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
|
//need to change the comparison as ie passes back a different style
|
||||||
//of url
|
//of url
|
||||||
if(m_historyEnabled && !m_historyLoadingFromList &&
|
if(m_historyEnabled && !m_historyLoadingFromList &&
|
||||||
(url == GetCurrentURL() ||
|
(url == GetCurrentURL() ||
|
||||||
(GetCurrentURL().substr(0, 4) == "file" &&
|
(GetCurrentURL().substr(0, 4) == "file" &&
|
||||||
wxFileSystem::URLToFileName(GetCurrentURL()).GetFullPath() == url)))
|
wxFileSystem::URLToFileName(GetCurrentURL()).GetFullPath() == url)))
|
||||||
{
|
{
|
||||||
//If we are not at the end of the list, then erase everything
|
//If we are not at the end of the list, then erase everything
|
||||||
@@ -1081,7 +1081,7 @@ HRESULT VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSi
|
|||||||
wxUnusedVar(grfPI);
|
wxUnusedVar(grfPI);
|
||||||
wxUnusedVar(dwReserved);
|
wxUnusedVar(dwReserved);
|
||||||
m_protocolSink = pOIProtSink;
|
m_protocolSink = pOIProtSink;
|
||||||
|
|
||||||
//We get the file itself from the protocol handler
|
//We get the file itself from the protocol handler
|
||||||
m_file = m_handler->GetFile(szUrl);
|
m_file = m_handler->GetFile(szUrl);
|
||||||
|
|
||||||
@@ -1096,13 +1096,13 @@ HRESULT VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSi
|
|||||||
wxBSCF_DATAFULLYAVAILABLE |
|
wxBSCF_DATAFULLYAVAILABLE |
|
||||||
wxBSCF_LASTDATANOTIFICATION,
|
wxBSCF_LASTDATANOTIFICATION,
|
||||||
length, length);
|
length, length);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
|
HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
|
||||||
{
|
{
|
||||||
//If the file is null we return false to indicte it is finished
|
//If the file is null we return false to indicte it is finished
|
||||||
if(!m_file)
|
if(!m_file)
|
||||||
return S_FALSE;
|
return S_FALSE;
|
||||||
|
|
||||||
wxStreamError err = m_file->GetStream()->Read(pv, cb).GetLastError();
|
wxStreamError err = m_file->GetStream()->Read(pv, cb).GetLastError();
|
||||||
@@ -1141,7 +1141,7 @@ HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
|
|||||||
HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
|
HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
|
||||||
void ** ppvObject)
|
void ** ppvObject)
|
||||||
{
|
{
|
||||||
if (pUnkOuter)
|
if (pUnkOuter)
|
||||||
return CLASS_E_NOAGGREGATION;
|
return CLASS_E_NOAGGREGATION;
|
||||||
VirtualProtocol* vp = new VirtualProtocol(m_handler);
|
VirtualProtocol* vp = new VirtualProtocol(m_handler);
|
||||||
vp->AddRef();
|
vp->AddRef();
|
||||||
@@ -1149,7 +1149,7 @@ HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
|
|||||||
vp->Release();
|
vp->Release();
|
||||||
return hr;
|
return hr;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
STDMETHODIMP ClassFactory::LockServer(BOOL fLock)
|
STDMETHODIMP ClassFactory::LockServer(BOOL fLock)
|
||||||
{
|
{
|
||||||
@@ -1192,6 +1192,6 @@ ULONG ClassFactory::Release(void)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE
|
#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE
|
||||||
|
Reference in New Issue
Block a user