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

Add missing wxSTDCALL to fix wxWebView compilation with Borland.

Browse Source 
This patch from Guru Kathiresan fixes compilation with Borland C++ Builder
2007 and XE2.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-23 15:03:01 +00:00
parent 09fc8e245c
commit a9c5eac9e4
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/msw/webview_ie.cpp
View File

@@ -1173,7 +1173,7 @@ END_IID_TABLE;
IMPLEMENT_IUNKNOWN_METHODS(VirtualProtocol) IMPLEMENT_IUNKNOWN_METHODS(VirtualProtocol)
HRESULT VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink, HRESULT STDMETHODCALLTYPE VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink,
wxIInternetBindInfo *pOIBindInfo, DWORD grfPI, wxIInternetBindInfo *pOIBindInfo, DWORD grfPI,
HANDLE_PTR dwReserved) HANDLE_PTR dwReserved)
{ {
@@ -1200,7 +1200,7 @@ HRESULT VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSi
return S_OK; return S_OK;
} }
HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead) HRESULT STDMETHODCALLTYPE 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)
@@ -1246,7 +1246,7 @@ END_IID_TABLE;
IMPLEMENT_IUNKNOWN_METHODS(ClassFactory) IMPLEMENT_IUNKNOWN_METHODS(ClassFactory)
HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid, HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
void ** ppvObject) void ** ppvObject)
{ {
if (pUnkOuter) if (pUnkOuter)
@@ -1288,7 +1288,7 @@ bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface,
return false; return false;
} }
HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt, HRESULT wxSTDCALL DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
IUnknown *pcmdtReserved, IUnknown *pcmdtReserved,
IDispatch *pdispReserved) IDispatch *pdispReserved)
{ {
@@ -1299,14 +1299,14 @@ HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::GetHostInfo(DOCHOSTUIINFO *pInfo) HRESULT wxSTDCALL DocHostUIHandler::GetHostInfo(DOCHOSTUIINFO *pInfo)
{ {
//don't show 3d border and enable themes. //don't show 3d border and enable themes.
pInfo->dwFlags = pInfo->dwFlags | DOCHOSTUIFLAG_NO3DBORDER | DOCHOSTUIFLAG_THEME; pInfo->dwFlags = pInfo->dwFlags | DOCHOSTUIFLAG_NO3DBORDER | DOCHOSTUIFLAG_THEME;
return S_OK; return S_OK;
} }
HRESULT DocHostUIHandler::ShowUI(DWORD dwID, HRESULT wxSTDCALL DocHostUIHandler::ShowUI(DWORD dwID,
IOleInPlaceActiveObject *pActiveObject, IOleInPlaceActiveObject *pActiveObject,
IOleCommandTarget *pCommandTarget, IOleCommandTarget *pCommandTarget,
IOleInPlaceFrame *pFrame, IOleInPlaceFrame *pFrame,
@@ -1320,35 +1320,35 @@ HRESULT DocHostUIHandler::ShowUI(DWORD dwID,
return S_FALSE; return S_FALSE;
} }
HRESULT DocHostUIHandler::HideUI(void) HRESULT wxSTDCALL DocHostUIHandler::HideUI(void)
{ {
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::UpdateUI(void) HRESULT wxSTDCALL DocHostUIHandler::UpdateUI(void)
{ {
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::EnableModeless(BOOL fEnable) HRESULT wxSTDCALL DocHostUIHandler::EnableModeless(BOOL fEnable)
{ {
wxUnusedVar(fEnable); wxUnusedVar(fEnable);
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::OnDocWindowActivate(BOOL fActivate) HRESULT wxSTDCALL DocHostUIHandler::OnDocWindowActivate(BOOL fActivate)
{ {
wxUnusedVar(fActivate); wxUnusedVar(fActivate);
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::OnFrameWindowActivate(BOOL fActivate) HRESULT wxSTDCALL DocHostUIHandler::OnFrameWindowActivate(BOOL fActivate)
{ {
wxUnusedVar(fActivate); wxUnusedVar(fActivate);
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder, HRESULT wxSTDCALL DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
IOleInPlaceUIWindow *pUIWindow, IOleInPlaceUIWindow *pUIWindow,
BOOL fFrameWindow) BOOL fFrameWindow)
{ {
@@ -1358,7 +1358,7 @@ HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg, HRESULT wxSTDCALL DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
const GUID *pguidCmdGroup, const GUID *pguidCmdGroup,
DWORD nCmdID) DWORD nCmdID)
{ {
@@ -1390,14 +1390,14 @@ HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::GetOptionKeyPath(LPOLESTR *pchKey,DWORD dw) HRESULT wxSTDCALL DocHostUIHandler::GetOptionKeyPath(LPOLESTR *pchKey,DWORD dw)
{ {
wxUnusedVar(pchKey); wxUnusedVar(pchKey);
wxUnusedVar(dw); wxUnusedVar(dw);
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::GetDropTarget(IDropTarget *pDropTarget, HRESULT wxSTDCALL DocHostUIHandler::GetDropTarget(IDropTarget *pDropTarget,
IDropTarget **ppDropTarget) IDropTarget **ppDropTarget)
{ {
wxUnusedVar(pDropTarget); wxUnusedVar(pDropTarget);
@@ -1405,13 +1405,13 @@ HRESULT DocHostUIHandler::GetDropTarget(IDropTarget *pDropTarget,
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::GetExternal(IDispatch **ppDispatch) HRESULT wxSTDCALL DocHostUIHandler::GetExternal(IDispatch **ppDispatch)
{ {
wxUnusedVar(ppDispatch); wxUnusedVar(ppDispatch);
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::TranslateUrl(DWORD dwTranslate, HRESULT wxSTDCALL DocHostUIHandler::TranslateUrl(DWORD dwTranslate,
OLECHAR *pchURLIn, OLECHAR *pchURLIn,
OLECHAR **ppchURLOut) OLECHAR **ppchURLOut)
{ {
@@ -1421,7 +1421,7 @@ HRESULT DocHostUIHandler::TranslateUrl(DWORD dwTranslate,
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DocHostUIHandler::FilterDataObject(IDataObject *pDO, IDataObject **ppDORet) HRESULT wxSTDCALL DocHostUIHandler::FilterDataObject(IDataObject *pDO, IDataObject **ppDORet)
{ {
wxUnusedVar(pDO); wxUnusedVar(pDO);
wxUnusedVar(ppDORet); wxUnusedVar(ppDORet);