Index: core/include/fxge/fx_font.h |
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h |
index 2832fbfcbcfdb0916b714f68a4108f3ea4ec31f2..5797ecb246b3ffd9b80399d218ad5173555e594a 100644 |
--- a/core/include/fxge/fx_font.h |
+++ b/core/include/fxge/fx_font.h |
@@ -18,7 +18,6 @@ class IFX_FontEncoding; |
class CFX_PathData; |
class CFX_SubstFont; |
class CFX_FaceCache; |
-class IFX_FontMapper; |
class CFX_FontMapper; |
class IFX_SystemFontInfo; |
class CFontFileFaceInfo; |
@@ -224,22 +223,10 @@ public: |
FX_BOOL GetStandardFont(const uint8_t*& pFontData, FX_DWORD& size, int index); |
CFX_FontMapper* m_pBuiltinMapper; |
- IFX_FontMapper* m_pExtMapper; |
CFX_MapByteStringToPtr m_FaceMap; |
FXFT_Library m_FTLibrary; |
FoxitFonts m_ExternalFonts[16]; |
}; |
-class IFX_FontMapper |
-{ |
-public: |
- |
- virtual ~IFX_FontMapper() {} |
- |
- virtual FXFT_Face FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags, |
- int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont) = 0; |
- |
- CFX_FontMgr* m_pFontMgr; |
-}; |
class IFX_FontEnumerator |
{ |
public: |
@@ -256,11 +243,12 @@ public: |
virtual int CountFiles() = 0; |
virtual IFX_FileStream* GetFontFile(int index) = 0; |
}; |
-class CFX_FontMapper : public IFX_FontMapper |
+class CFX_FontMapper |
{ |
public: |
- CFX_FontMapper(); |
- virtual ~CFX_FontMapper(); |
+ CFX_FontMapper(CFX_FontMgr* mgr); |
+ ~CFX_FontMapper(); |
+ |
void SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo); |
IFX_SystemFontInfo* GetSystemFontInfo() |
{ |
@@ -277,8 +265,8 @@ public: |
{ |
return m_pFontEnumerator; |
} |
- virtual FXFT_Face FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags, |
- int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont); |
+ FXFT_Face FindSubstFont(const CFX_ByteString& face_name, FX_BOOL bTrueType, FX_DWORD flags, |
+ int weight, int italic_angle, int CharsetCP, CFX_SubstFont* pSubstFont); |
private: |
CFX_ByteString GetPSNameFromTT(void* hFont); |
CFX_ByteString MatchInstalledFonts(const CFX_ByteString& norm_name); |
@@ -292,6 +280,7 @@ private: |
IFX_SystemFontInfo* m_pFontInfo; |
FXFT_Face m_FoxitFaces[14]; |
IFX_FontEnumerator* m_pFontEnumerator; |
+ CFX_FontMgr* const m_pFontMgr; |
}; |
class IFX_SystemFontInfo |
{ |