From: Vadim Zeitlin Date: Fri, 18 Nov 2011 23:40:24 +0000 (+0000) Subject: No changes, just remove extra whitespace from wxWebViewIE code. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/60eabdbebf37c13e8011cdd2e5fb3faa18c95d91 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 --- diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h index d7c9a7d636..d5304e2a7e 100644 --- a/include/wx/msw/webview_ie.h +++ b/include/wx/msw/webview_ie.h @@ -274,7 +274,7 @@ private: * Busy property is false but should be true. */ 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 //an item from the history. The position is stored as an int, and reflects //where we are in the history list. @@ -313,27 +313,27 @@ public: ULONG STDMETHODCALLTYPE Release(); //IInternetProtocolRoot - HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason), + HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason), DWORD WXUNUSED(dwOptions)) { return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData)) { return S_OK; } HRESULT STDMETHODCALLTYPE Resume() { return S_OK; } - HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl, + HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink, wxIInternetBindInfo *pOIBindInfo, - DWORD grfPI, + DWORD grfPI, HANDLE_PTR dwReserved); HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; } HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; } //IInternetProtocol - HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) + HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) { return S_OK; } HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead); - HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove), - DWORD WXUNUSED(dwOrigin), - ULARGE_INTEGER* WXUNUSED(plibNewPosition)) + HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove), + DWORD WXUNUSED(dwOrigin), + ULARGE_INTEGER* WXUNUSED(plibNewPosition)) { return E_FAIL; } HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; } }; @@ -348,7 +348,7 @@ public: ULONG STDMETHODCALLTYPE Release(); //IClassFactory - HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter, + HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter, REFIID riid, void** ppvObject); HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock); private: diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index 239b86290e..0ba0a722da 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -472,7 +472,7 @@ void wxWebViewIE::SetOfflineMode(bool offline) } bool wxWebViewIE::IsBusy() const -{ +{ if (m_isBusy) return true; 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 //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 //of url - if(m_historyEnabled && !m_historyLoadingFromList && - (url == GetCurrentURL() || - (GetCurrentURL().substr(0, 4) == "file" && + 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 @@ -1081,7 +1081,7 @@ HRESULT VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSi wxUnusedVar(grfPI); wxUnusedVar(dwReserved); m_protocolSink = pOIProtSink; - + //We get the file itself from the protocol handler m_file = m_handler->GetFile(szUrl); @@ -1096,13 +1096,13 @@ HRESULT VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSi wxBSCF_DATAFULLYAVAILABLE | wxBSCF_LASTDATANOTIFICATION, length, length); - return S_OK; + return S_OK; } HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead) { //If the file is null we return false to indicte it is finished - if(!m_file) + if(!m_file) return S_FALSE; 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, void ** ppvObject) { - if (pUnkOuter) + if (pUnkOuter) return CLASS_E_NOAGGREGATION; VirtualProtocol* vp = new VirtualProtocol(m_handler); vp->AddRef(); @@ -1149,7 +1149,7 @@ HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid, vp->Release(); return hr; -} +} STDMETHODIMP ClassFactory::LockServer(BOOL fLock) { @@ -1192,6 +1192,6 @@ ULONG ClassFactory::Release(void) return 0; } -} +} #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE