Cleanup some fxge font code.

core/include/fxge/fx_font.h

Index: core/include/fxge/fx_font.h
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 3e4ca95299ce0998155433852fd82350f2f41962..c6643a5983a3161bcc32c014f79f719919535457 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -139,6 +139,7 @@ class CFX_UnicodeEncoding {
 #define FXFONT_SUBST_NONSYMBOL 0x20
 #define FXFONT_SUBST_EXACT 0x40
 #define FXFONT_SUBST_STANDARD 0x80
+
 class CFX_SubstFont {
  public:
   CFX_SubstFont();
@@ -385,6 +386,7 @@ class CFX_GlyphBitmap {
 };
 class CFX_FaceCache {
  public:
+  explicit CFX_FaceCache(FXFT_Face face);
   ~CFX_FaceCache();
   const CFX_GlyphBitmap* LoadGlyphBitmap(CFX_Font* pFont,
                                          FX_DWORD glyph_index,
@@ -397,10 +399,8 @@ class CFX_FaceCache {
                                     FX_DWORD glyph_index,
                                     int dest_width);
 
-  CFX_FaceCache(FXFT_Face face);
-
  private:
-  FXFT_Face m_Face;
+  FXFT_Face const m_Face;

[Tom Sepez, 2015/11/09 18:05:17]

nit: Someday we'll lose the *s in the typedefs, and this will make sense as
FXFT_FaceRec* const m_Face, but for now the const looks to be in a weird place,
though putting it first is misleading. Hmm.

[Lei Zhang, 2015/11/09 18:41:03]

I reordered the methods / variables.

   CFX_GlyphBitmap* RenderGlyph(CFX_Font* pFont,
                                FX_DWORD glyph_index,
                                FX_BOOL bFontStyle,
@@ -426,11 +426,13 @@ class CFX_FaceCache {
   void InitPlatform();
   void DestroyPlatform();
 };
-typedef struct {
+
+struct FXTEXT_GLYPHPOS {
   const CFX_GlyphBitmap* m_pGlyph;
   int m_OriginX, m_OriginY;

[Tom Sepez, 2015/11/09 18:05:17]

nit: one per line (next line too).

[Lei Zhang, 2015/11/09 18:41:03]

Done.

   FX_FLOAT m_fOriginX, m_fOriginY;
-} FXTEXT_GLYPHPOS;
+};
+
 FX_RECT FXGE_GetGlyphsBBox(FXTEXT_GLYPHPOS* pGlyphAndPos,
                            int nChars,
                            int anti_alias,