Index: core/fxge/include/fx_font.h |
diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h |
index aa59e0a5d4f9dbf38fb0a28f7fcf36f79aa06e08..d22840a82f7707e4a778efc811765f49bd40808a 100644 |
--- a/core/fxge/include/fx_font.h |
+++ b/core/fxge/include/fx_font.h |
@@ -287,16 +287,6 @@ class CFX_FontMgr { |
FXFT_Library m_FTLibrary; |
}; |
-class IFX_FontEnumerator { |
- public: |
- virtual void HitFont() = 0; |
- |
- virtual void Finish() = 0; |
- |
- protected: |
- virtual ~IFX_FontEnumerator() {} |
-}; |
- |
class IFX_AdditionalFontEnum { |
public: |
virtual int CountFiles() = 0; |
@@ -316,10 +306,7 @@ class CFX_FontMapper { |
void AddInstalledFont(const CFX_ByteString& name, int charset); |
void LoadInstalledFonts(); |
std::vector<CFX_ByteString> m_InstalledTTFonts; |
Tom Sepez
2016/04/06 20:35:13
nit: move this public member below last public met
dsinclair
2016/04/06 20:39:19
Done.
|
- void SetFontEnumerator(IFX_FontEnumerator* pFontEnumerator) { |
- m_pFontEnumerator = pFontEnumerator; |
- } |
- IFX_FontEnumerator* GetFontEnumerator() const { return m_pFontEnumerator; } |
+ |
FXFT_Face FindSubstFont(const CFX_ByteString& face_name, |
FX_BOOL bTrueType, |
uint32_t flags, |
@@ -356,7 +343,6 @@ class CFX_FontMapper { |
std::vector<CFX_ByteString> m_FaceArray; |
IFX_SystemFontInfo* m_pFontInfo; |
FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT]; |
- IFX_FontEnumerator* m_pFontEnumerator; |
CFX_FontMgr* const m_pFontMgr; |
}; |