| Index: core/src/fxge/win32/dwrite_int.h
|
| diff --git a/core/src/fxge/win32/dwrite_int.h b/core/src/fxge/win32/dwrite_int.h
|
| index dc2a338935092def5df9937ba5fbc0d30f51cf1f..a2c91ce5b4afec46d089aca324ce4aa588439e42 100644
|
| --- a/core/src/fxge/win32/dwrite_int.h
|
| +++ b/core/src/fxge/win32/dwrite_int.h
|
| @@ -8,54 +8,59 @@
|
| #define CORE_SRC_FXGE_WIN32_DWRITE_INT_H_
|
|
|
| #ifndef DECLSPEC_UUID
|
| -#if (_MSC_VER >= 1100) && defined (__cplusplus)
|
| -#define DECLSPEC_UUID(x) __declspec(uuid(x))
|
| +#if (_MSC_VER >= 1100) && defined(__cplusplus)
|
| +#define DECLSPEC_UUID(x) __declspec(uuid(x))
|
| #else
|
| #define DECLSPEC_UUID(x)
|
| #endif
|
| #endif
|
| #ifndef DECLSPEC_NOVTABLE
|
| #if (_MSC_VER >= 1100) && defined(__cplusplus)
|
| -#define DECLSPEC_NOVTABLE __declspec(novtable)
|
| +#define DECLSPEC_NOVTABLE __declspec(novtable)
|
| #else
|
| #define DECLSPEC_NOVTABLE
|
| #endif
|
| #endif
|
| -#if(WINVER < 0x0500)
|
| +#if (WINVER < 0x0500)
|
| #ifndef _MAC
|
| DECLARE_HANDLE(HMONITOR);
|
| #endif
|
| #endif
|
| -class CDWriteExt
|
| -{
|
| -public:
|
| - CDWriteExt();
|
| - ~CDWriteExt();
|
| -
|
| - void Load();
|
| - void Unload();
|
| -
|
| - FX_BOOL IsAvailable()
|
| - {
|
| - return m_pDWriteFactory != NULL;
|
| - }
|
| -
|
| - void* DwCreateFontFaceFromStream(uint8_t* pData, FX_DWORD size, int simulation_style);
|
| - FX_BOOL DwCreateRenderingTarget(CFX_DIBitmap* pSrc, void** renderTarget);
|
| - void DwDeleteRenderingTarget(void* renderTarget);
|
| - FX_BOOL DwRendingString(void* renderTarget, CFX_ClipRgn* pClipRgn, FX_RECT& stringRect, CFX_AffineMatrix* pMatrix,
|
| - void *font, FX_FLOAT font_size, FX_ARGB text_color,
|
| - int glyph_count, unsigned short* glyph_indices,
|
| - FX_FLOAT baselineOriginX, FX_FLOAT baselineOriginY,
|
| - void* glyph_offsets,
|
| - FX_FLOAT* glyph_advances);
|
| - void DwDeleteFont(void* pFont);
|
| -
|
| -protected:
|
| - void* m_hModule;
|
| - void* m_pDWriteFactory;
|
| - void* m_pDwFontContext;
|
| - void* m_pDwTextRenderer;
|
| +class CDWriteExt {
|
| + public:
|
| + CDWriteExt();
|
| + ~CDWriteExt();
|
| +
|
| + void Load();
|
| + void Unload();
|
| +
|
| + FX_BOOL IsAvailable() { return m_pDWriteFactory != NULL; }
|
| +
|
| + void* DwCreateFontFaceFromStream(uint8_t* pData,
|
| + FX_DWORD size,
|
| + int simulation_style);
|
| + FX_BOOL DwCreateRenderingTarget(CFX_DIBitmap* pSrc, void** renderTarget);
|
| + void DwDeleteRenderingTarget(void* renderTarget);
|
| + FX_BOOL DwRendingString(void* renderTarget,
|
| + CFX_ClipRgn* pClipRgn,
|
| + FX_RECT& stringRect,
|
| + CFX_AffineMatrix* pMatrix,
|
| + void* font,
|
| + FX_FLOAT font_size,
|
| + FX_ARGB text_color,
|
| + int glyph_count,
|
| + unsigned short* glyph_indices,
|
| + FX_FLOAT baselineOriginX,
|
| + FX_FLOAT baselineOriginY,
|
| + void* glyph_offsets,
|
| + FX_FLOAT* glyph_advances);
|
| + void DwDeleteFont(void* pFont);
|
| +
|
| + protected:
|
| + void* m_hModule;
|
| + void* m_pDWriteFactory;
|
| + void* m_pDwFontContext;
|
| + void* m_pDwTextRenderer;
|
| };
|
|
|
| #endif // CORE_SRC_FXGE_WIN32_DWRITE_INT_H_
|
|
|