| Index: core/include/fxge/fpf.h
|
| diff --git a/core/include/fxge/fpf.h b/core/include/fxge/fpf.h
|
| index 30c1c77bbe19a83a5e381c91b609db5cf1de3ab8..710600c84fbe6490abb195bb3549d03f1779e555 100644
|
| --- a/core/include/fxge/fpf.h
|
| +++ b/core/include/fxge/fpf.h
|
| @@ -20,7 +20,7 @@ public:
|
| IFPF_DeviceModule* FPF_GetDeviceModule();
|
| #define FPF_MATCHFONT_REPLACEANSI 1
|
| typedef struct FPF_HFONT_ {
|
| - FX_LPVOID pData;
|
| + void* pData;
|
| }* FPF_HFONT;
|
| class IFPF_Font
|
| {
|
| @@ -44,7 +44,7 @@ public:
|
|
|
| virtual int32_t GetHeight() const = 0;
|
| virtual int32_t GetItalicAngle() const = 0;
|
| - virtual FX_DWORD GetFontData(FX_DWORD dwTable, FX_LPBYTE pBuffer, FX_DWORD dwSize) = 0;
|
| + virtual FX_DWORD GetFontData(FX_DWORD dwTable, uint8_t* pBuffer, FX_DWORD dwSize) = 0;
|
|
|
| protected:
|
| ~IFPF_Font() { }
|
| @@ -56,7 +56,7 @@ public:
|
| virtual void LoadSystemFonts() = 0;
|
| virtual void LoadPrivateFont(IFX_FileRead* pFontFile) = 0;
|
| virtual void LoadPrivateFont(FX_BSTR bsFileName) = 0;
|
| - virtual void LoadPrivateFont(FX_LPVOID pBuffer, size_t szBuffer) = 0;
|
| + virtual void LoadPrivateFont(void* pBuffer, size_t szBuffer) = 0;
|
|
|
| virtual IFPF_Font* CreateFont(FX_BSTR bsFamilyname, uint8_t charset, FX_DWORD dwStyle, FX_DWORD dwMatch = 0) = 0;
|
| };
|
|
|