Fix build warnings in Direct2D related code
Regressions sincedf1456e4e2
andb936bfe85e
. See https://github.com/wxWidgets/wxWidgets/pull/731
This commit is contained in:
committed by
Vadim Zeitlin
parent
b493b7008b
commit
8577d9ddca
@@ -41,8 +41,8 @@
|
|||||||
#include <wincodec.h>
|
#include <wincodec.h>
|
||||||
|
|
||||||
#ifdef __MINGW64_TOOLCHAIN__
|
#ifdef __MINGW64_TOOLCHAIN__
|
||||||
#ifndef DRWITE_E_NOFONT
|
#ifndef DWRITE_E_NOFONT
|
||||||
#define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002)
|
#define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002L)
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -797,9 +797,9 @@ bool SurfaceFontDataD2D::Initialised() const
|
|||||||
// SurfaceDataD2D
|
// SurfaceDataD2D
|
||||||
|
|
||||||
SurfaceDataD2D::SurfaceDataD2D(ScintillaWX* editor)
|
SurfaceDataD2D::SurfaceDataD2D(ScintillaWX* editor)
|
||||||
: m_editor(editor),
|
: m_pD2DFactory(::wxD2D1Factory()),
|
||||||
m_pD2DFactory(::wxD2D1Factory()),
|
m_pDWriteFactory(::wxDWriteFactory()),
|
||||||
m_pDWriteFactory(::wxDWriteFactory())
|
m_editor(editor)
|
||||||
{
|
{
|
||||||
if ( Initialised() )
|
if ( Initialised() )
|
||||||
{
|
{
|
||||||
@@ -1107,7 +1107,7 @@ void SurfaceD2D::Release()
|
|||||||
m_clipsActive--;
|
m_clipsActive--;
|
||||||
}
|
}
|
||||||
hr = m_pRenderTarget->EndDraw();
|
hr = m_pRenderTarget->EndDraw();
|
||||||
if ( hr == D2DERR_RECREATE_TARGET && m_surfaceData && !m_ownRenderTarget )
|
if ( hr == (HRESULT)D2DERR_RECREATE_TARGET && m_surfaceData && !m_ownRenderTarget )
|
||||||
{
|
{
|
||||||
m_surfaceData->DiscardGraphicsResources();
|
m_surfaceData->DiscardGraphicsResources();
|
||||||
m_surfaceData->SetEditorPaintAbandoned();
|
m_surfaceData->SetEditorPaintAbandoned();
|
||||||
|
Reference in New Issue
Block a user