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

Fix -Wmicrosoft-exception-spec warning

Browse Source
This commit is contained in:
Maarten Bent
2020-04-26 21:12:30 +02:00
parent 08ae164417
commit abb2eb9ed0
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/graphicsd2d.cpp
View File

@@ -391,7 +391,7 @@ public:
}
// IDWriteFontFileEnumerator methods
virtual HRESULT STDMETHODCALLTYPE MoveNext(BOOL* pHasCurrentFile) wxOVERRIDE
virtual wxSTDMETHODIMP MoveNext(BOOL* pHasCurrentFile) wxOVERRIDE
{
HRESULT hr = S_OK;
@@ -411,7 +411,7 @@ public:
return hr;
}
virtual HRESULT STDMETHODCALLTYPE GetCurrentFontFile(IDWriteFontFile** ppFontFile) wxOVERRIDE
virtual wxSTDMETHODIMP GetCurrentFontFile(IDWriteFontFile** ppFontFile) wxOVERRIDE
{
if ( m_currentFile )
{
@@ -450,7 +450,7 @@ public:
}
// IDWriteFontCollectionLoader methods
virtual HRESULT STDMETHODCALLTYPE CreateEnumeratorFromKey(IDWriteFactory* pFactory,
virtual wxSTDMETHODIMP CreateEnumeratorFromKey(IDWriteFactory* pFactory,
void const* pCollectionKey, UINT32 collectionKeySize,
IDWriteFontFileEnumerator** pFontFileEnumerator) wxOVERRIDE
{