| Index: core/src/fxge/win32/fx_win32_dwrite.cpp
|
| diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp
|
| index 2b32d572b5374bce99ec90781378ee38042da29d..1ad4f8c4576e47891808c077b0f0513cf4ce5bfb 100644
|
| --- a/core/src/fxge/win32/fx_win32_dwrite.cpp
|
| +++ b/core/src/fxge/win32/fx_win32_dwrite.cpp
|
| @@ -26,7 +26,7 @@ inline InterfaceType* SafeAcquire(InterfaceType* newObject)
|
| }
|
| return newObject;
|
| }
|
| -class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream, public CFX_Object
|
| +class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream
|
| {
|
| public:
|
| explicit CDwFontFileStream(void const* fontFileReferenceKey, UINT32 fontFileReferenceKeySize);
|
| @@ -46,7 +46,7 @@ private:
|
| void const* resourcePtr_;
|
| DWORD resourceSize_;
|
| };
|
| -class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader, public CFX_Object
|
| +class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader
|
| {
|
| public:
|
| virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void** ppvObject);
|
| @@ -71,7 +71,7 @@ private:
|
| ULONG refCount_;
|
| static IDWriteFontFileLoader* instance_;
|
| };
|
| -class CDwFontContext : public CFX_Object
|
| +class CDwFontContext
|
| {
|
| public:
|
| CDwFontContext(IDWriteFactory* dwriteFactory);
|
| @@ -83,7 +83,7 @@ private:
|
| HRESULT hr_;
|
| IDWriteFactory* dwriteFactory_;
|
| };
|
| -class CDwGdiTextRenderer : public CFX_Object
|
| +class CDwGdiTextRenderer
|
| {
|
| public:
|
| CDwGdiTextRenderer(
|
|
|