kc3-lang/ftgl

diff --git a/include/FTFont.h b/include/FTFont.h
index f61a565..d557fc5 100644
--- a/include/FTFont.h
+++ b/include/FTFont.h
@@ -53,13 +53,13 @@ class FTGL_EXPORT FTFont
         /* Allow FTLayout classes to access this->impl. */
         friend class FTLayoutImpl;
 
-    public:
+    protected:
         /**
          * Open and read a font file. Sets Error flag.
          *
          * @param fontFilePath  font file path.
          */
-        FTFont(FTGL::FontType type, const char* fontFilePath);
+        FTFont(const char* fontFilePath);
 
         /**
          * Open and read a font from a buffer in memory. Sets Error flag.
@@ -69,14 +69,14 @@ class FTGL_EXPORT FTFont
          * @param pBufferBytes  the in-memory buffer
          * @param bufferSizeInBytes  the length of the buffer in bytes
          */
-        FTFont(FTGL::FontType type,
-               const unsigned char *pBufferBytes, size_t bufferSizeInBytes);
+        FTFont(const unsigned char *pBufferBytes, size_t bufferSizeInBytes);
 
         /**
          * Destructor
          */
         virtual ~FTFont();
 
+    public:
         /**
          * Attach auxilliary file to font e.g font metrics.
          *
diff --git a/include/FTLayout.h b/include/FTLayout.h
index 77f1445..11242b2 100644
--- a/include/FTLayout.h
+++ b/include/FTLayout.h
@@ -45,11 +45,12 @@ class FTLayoutImpl;
  */
 class FTGL_EXPORT FTLayout
 {
-    public:
-        FTLayout(FTGL::LayoutType type);
+    protected:
+        FTLayout();
 
         virtual ~FTLayout();
 
+    public:
         void BBox(const char* string, float& llx, float& lly,
                   float& llz, float& urx, float& ury, float& urz);
 
diff --git a/include/ftgl.h b/include/ftgl.h
index cde4e52..b90727e 100644
--- a/include/ftgl.h
+++ b/include/ftgl.h
@@ -69,21 +69,6 @@ namespace FTGL
         ALIGN_RIGHT,
         ALIGN_JUSTIFY,
     } TextAlignment;
-
-    typedef enum
-    {
-        FONT_BITMAP,
-        FONT_PIXMAP,
-        FONT_OUTLINE,
-        FONT_POLYGON,
-        FONT_EXTRUDE,
-        FONT_TEXTURE,
-    } FontType;
-
-    typedef enum
-    {
-        LAYOUT_SIMPLE,
-    } LayoutType;
 }
 #else
 #   define FTGL_RENDER_FRONT  0x01
diff --git a/src/FTFont.cpp b/src/FTFont.cpp
index 4ecfd47..84ae767 100644
--- a/src/FTFont.cpp
+++ b/src/FTFont.cpp
@@ -47,61 +47,24 @@
 //
 
 
-FTFont::FTFont(FTGL::FontType type, const char* fontFilePath)
+FTFont::FTFont(const char* fontFilePath)
 {
-    switch(type)
-    {
-        case FTGL::FONT_BITMAP:
-            impl = new FTGLBitmapFontImpl(fontFilePath);
-            break;
-        case FTGL::FONT_EXTRUDE:
-            impl = new FTGLExtrdFontImpl(fontFilePath);
-            break;
-        case FTGL::FONT_OUTLINE:
-            impl = new FTGLOutlineFontImpl(fontFilePath);
-            break;
-        case FTGL::FONT_PIXMAP:
-            impl = new FTGLPixmapFontImpl(fontFilePath);
-            break;
-        case FTGL::FONT_POLYGON:
-            impl = new FTGLPolygonFontImpl(fontFilePath);
-            break;
-        case FTGL::FONT_TEXTURE:
-            impl = new FTGLTextureFontImpl(fontFilePath);
-            break;
-    }
+    /* impl is set by the child class */
+    impl = NULL;
 }
 
 
-FTFont::FTFont(FTGL::FontType type,
-               const unsigned char *pBufferBytes, size_t bufferSizeInBytes)
+FTFont::FTFont(const unsigned char *pBufferBytes, size_t bufferSizeInBytes)
 {
-    switch(type)
-    {
-        case FTGL::FONT_BITMAP:
-            impl = new FTGLBitmapFontImpl(pBufferBytes, bufferSizeInBytes);
-            break;
-        case FTGL::FONT_EXTRUDE:
-            impl = new FTGLExtrdFontImpl(pBufferBytes, bufferSizeInBytes);
-            break;
-        case FTGL::FONT_OUTLINE:
-            impl = new FTGLOutlineFontImpl(pBufferBytes, bufferSizeInBytes);
-            break;
-        case FTGL::FONT_PIXMAP:
-            impl = new FTGLPixmapFontImpl(pBufferBytes, bufferSizeInBytes);
-            break;
-        case FTGL::FONT_POLYGON:
-            impl = new FTGLPolygonFontImpl(pBufferBytes, bufferSizeInBytes);
-            break;
-        case FTGL::FONT_TEXTURE:
-            impl = new FTGLTextureFontImpl(pBufferBytes, bufferSizeInBytes);
-            break;
-    }
+    /* impl is set by the child class */
+    impl = NULL;
 }
 
 
 FTFont::~FTFont()
 {
+    /* Only the top class should be allowed to destroy impl, because
+     * we do not know how many levels of inheritance there are. */
     delete impl;
 }
 
@@ -476,20 +439,6 @@ void FTFontImpl::BBox(const wchar_t* string, const int start, const int end,
 }
 
 
-void FTFontImpl::BBox(const char* string, float& llx, float& lly, float& llz,
-                  float& urx, float& ury, float& urz)
-{
-    BBox(string, 0, -1, llx, lly, llz, urx, ury, urz);
-}
-
-
-void FTFontImpl::BBox(const wchar_t* string, float& llx, float& lly, float& llz,
-                  float& urx, float& ury, float& urz)
-{
-    BBox(string, 0, -1, llx, lly, llz, urx, ury, urz);
-}
-
-
 template <typename T>
 inline float FTFontImpl::AdvanceI(const T* string)
 {
diff --git a/src/FTFontGlue.cpp b/src/FTFontGlue.cpp
index 489fc7b..7a7d862 100644
--- a/src/FTFontGlue.cpp
+++ b/src/FTFontGlue.cpp
@@ -58,8 +58,7 @@ static inline FTGLfont *createFTFont(FTGL::FontType type, const char *fontname)
 
     if(ftgl->ptr->Error())
     {
-        delete ftgl->ptr;
-        free(ftgl);
+        ftglDestroyFont(ftgl);
         return NULL;
     }
 
diff --git a/src/FTFontImpl.h b/src/FTFontImpl.h
index a8ba3d8..7373eb1 100644
--- a/src/FTFontImpl.h
+++ b/src/FTFontImpl.h
@@ -40,13 +40,13 @@ class FTFontImpl
         friend class FTLayoutImpl;
         friend class FTFont;
 
-    public:
+    protected:
         FTFontImpl(char const *fontFilePath);
 
 
         FTFontImpl(const unsigned char *pBufferBytes, size_t bufferSizeInBytes);
 
-        ~FTFontImpl();
+        virtual ~FTFontImpl();
 
         virtual void Render(const char* string);
 
@@ -75,17 +75,10 @@ class FTFontImpl
                   float& llx, float& lly, float& llz,
                   float& urx, float& ury, float& urz);
 
-        void BBox(const char* string, float& llx, float& lly, float& llz,
-                  float& urx, float& ury, float& urz);
-
-        void BBox(const wchar_t* string, float& llx, float& lly, float& llz,
-                  float& urx, float& ury, float& urz);
-
         float Advance(const wchar_t* string);
 
         float Advance(const char* string);
 
-    protected:
         /**
          * Construct a glyph of the correct type.
          *
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index 01208d4..353ee8c 100644
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -37,18 +37,18 @@
 //
 
 
-FTGLBitmapFont::FTGLBitmapFont(char const *fontFilePath) :
-    FTFont(FTGL::FONT_BITMAP, fontFilePath)
+FTGLBitmapFont::FTGLBitmapFont(char const *fontFilePath)
+: FTFont(fontFilePath)
 {
-    ;
+    impl = new FTGLBitmapFontImpl(fontFilePath);
 }
 
 
 FTGLBitmapFont::FTGLBitmapFont(unsigned char const *pBufferBytes,
-                               size_t bufferSizeInBytes) :
-    FTFont(FTGL::FONT_BITMAP, pBufferBytes, bufferSizeInBytes)
+                               size_t bufferSizeInBytes)
+: FTFont(pBufferBytes, bufferSizeInBytes)
 {
-    ;
+    impl = new FTGLBitmapFontImpl(pBufferBytes, bufferSizeInBytes);
 }
 
 
@@ -63,21 +63,6 @@ FTGLBitmapFont::~FTGLBitmapFont()
 //
 
 
-FTGLBitmapFontImpl::FTGLBitmapFontImpl(char const* fontFilePath)
-:   FTFontImpl(fontFilePath)
-{}
-
-
-FTGLBitmapFontImpl::FTGLBitmapFontImpl(unsigned char const *pBufferBytes,
-                                       size_t bufferSizeInBytes)
-:   FTFontImpl(pBufferBytes, bufferSizeInBytes)
-{}
-
-
-FTGLBitmapFontImpl::~FTGLBitmapFontImpl()
-{}
-
-
 FTGlyph* FTGLBitmapFontImpl::MakeGlyph(unsigned int g)
 {
     FT_GlyphSlot ftGlyph = face.Glyph(g, FT_LOAD_DEFAULT);
diff --git a/src/FTGLBitmapFontImpl.h b/src/FTGLBitmapFontImpl.h
index bc38a69..ac50f6d 100644
--- a/src/FTGLBitmapFontImpl.h
+++ b/src/FTGLBitmapFontImpl.h
@@ -35,17 +35,17 @@ class FTGLBitmapFontImpl : public FTFontImpl
 {
     friend class FTGLBitmapFont;
 
-    public:
-        FTGLBitmapFontImpl(const char* fontFilePath);
+    protected:
+        FTGLBitmapFontImpl(const char* fontFilePath) :
+            FTFontImpl(fontFilePath) {};
 
         FTGLBitmapFontImpl(const unsigned char *pBufferBytes,
-                           size_t bufferSizeInBytes);
+                           size_t bufferSizeInBytes) :
+            FTFontImpl(pBufferBytes, bufferSizeInBytes) {};
 
-        ~FTGLBitmapFontImpl();
+        virtual void Render(const char* string);
 
-        void Render(const char* string);
-
-        void Render(const wchar_t* string);
+        virtual void Render(const wchar_t* string);
 
     private:
         /**
diff --git a/src/FTGLExtrdFont.cpp b/src/FTGLExtrdFont.cpp
index e2fedac..46154f4 100644
--- a/src/FTGLExtrdFont.cpp
+++ b/src/FTGLExtrdFont.cpp
@@ -37,18 +37,18 @@
 //
 
 
-FTGLExtrdFont::FTGLExtrdFont(char const *fontFilePath) :
-    FTFont(FTGL::FONT_EXTRUDE, fontFilePath)
+FTGLExtrdFont::FTGLExtrdFont(char const *fontFilePath)
+: FTFont(fontFilePath)
 {
-    ;
+    impl = new FTGLExtrdFontImpl(fontFilePath);
 }
 
 
 FTGLExtrdFont::FTGLExtrdFont(const unsigned char *pBufferBytes,
-                             size_t bufferSizeInBytes) :
-    FTFont(FTGL::FONT_EXTRUDE, pBufferBytes, bufferSizeInBytes)
+                             size_t bufferSizeInBytes)
+: FTFont(pBufferBytes, bufferSizeInBytes)
 {
-    ;
+    impl = new FTGLExtrdFontImpl(pBufferBytes, bufferSizeInBytes);
 }
 
 
@@ -63,31 +63,6 @@ FTGLExtrdFont::~FTGLExtrdFont()
 //
 
 
-FTGLExtrdFontImpl::FTGLExtrdFontImpl(const char* fontFilePath)
-:   FTFontImpl(fontFilePath),
-    depth(0.0f)
-{
-    ;
-}
-
-
-FTGLExtrdFontImpl::FTGLExtrdFontImpl(const unsigned char *pBufferBytes,
-                                     size_t bufferSizeInBytes)
-:   FTFontImpl(pBufferBytes, bufferSizeInBytes),
-    depth(0.0f),
-    front(0.0f),
-    back(0.0f)
-{
-    ;
-}
-
-
-FTGLExtrdFontImpl::~FTGLExtrdFontImpl()
-{
-    ;
-}
-
-
 FTGlyph* FTGLExtrdFontImpl::MakeGlyph(unsigned int glyphIndex)
 {
     FT_GlyphSlot ftGlyph = face.Glyph(glyphIndex, FT_LOAD_NO_HINTING);
diff --git a/src/FTGLExtrdFontImpl.h b/src/FTGLExtrdFontImpl.h
index 3ae9000..cbf4293 100644
--- a/src/FTGLExtrdFontImpl.h
+++ b/src/FTGLExtrdFontImpl.h
@@ -35,28 +35,29 @@ class FTGLExtrdFontImpl : public FTFontImpl
 {
     friend class FTGLExtrdFont;
 
-    public:
-        FTGLExtrdFontImpl(const char* fontFilePath);
+    protected:
+        FTGLExtrdFontImpl(const char* fontFilePath) :
+          FTFontImpl(fontFilePath), depth(0.0f), front(0.0f), back(0.0f) {};
 
         FTGLExtrdFontImpl(const unsigned char *pBufferBytes,
-                          size_t bufferSizeInBytes);
-
-        ~FTGLExtrdFontImpl();
+                          size_t bufferSizeInBytes) :
+          FTFontImpl(pBufferBytes, bufferSizeInBytes),
+          depth(0.0f), front(0.0f), back(0.0f) {};
 
         /**
          * Set the extrusion distance for the font.
          *
          * @param d  The extrusion distance.
          */
-        void Depth(float d) { depth = d; }
+        virtual void Depth(float d) { depth = d; }
 
         /**
          * Set the outset distance for the font. Only implemented by
          * FTGLOutlineFont, FTGLPolygonFont and FTGLExtrdFont
          *
-         * @param f  The front outset distance.
+         * @param o  The outset distance.
          */
-        void Outset(float f) { front = f; }
+        virtual void Outset(float o) { front = back = o; }
 
         /**
          * Set the outset distance for the font. Only implemented by
@@ -65,7 +66,7 @@ class FTGLExtrdFontImpl : public FTFontImpl
          * @param f  The front outset distance.
          * @param b  The back outset distance.
          */
-        void Outset(float f, float b) { front = f; back = b; }
+        virtual void Outset(float f, float b) { front = f; back = b; }
 
     private:
         /**
@@ -74,7 +75,7 @@ class FTGLExtrdFontImpl : public FTFontImpl
          * @param glyphIndex The glyph index NOT the char code.
          * @return An FTExtrdGlyph or <code>null</code> on failure.
          */
-        inline virtual FTGlyph* MakeGlyph(unsigned int glyphIndex);
+        virtual FTGlyph* MakeGlyph(unsigned int glyphIndex);
 
         /**
          * The extrusion distance for the font.
diff --git a/src/FTGLOutlineFont.cpp b/src/FTGLOutlineFont.cpp
index 25b8539..65be17f 100644
--- a/src/FTGLOutlineFont.cpp
+++ b/src/FTGLOutlineFont.cpp
@@ -37,18 +37,18 @@
 //
 
 
-FTGLOutlineFont::FTGLOutlineFont(char const *fontFilePath) :
-    FTFont(FTGL::FONT_OUTLINE, fontFilePath)
+FTGLOutlineFont::FTGLOutlineFont(char const *fontFilePath)
+: FTFont(fontFilePath)
 {
-    ;
+    impl = new FTGLOutlineFontImpl(fontFilePath);
 }
 
 
 FTGLOutlineFont::FTGLOutlineFont(const unsigned char *pBufferBytes,
-                                 size_t bufferSizeInBytes) :
-    FTFont(FTGL::FONT_OUTLINE, pBufferBytes, bufferSizeInBytes)
+                                 size_t bufferSizeInBytes)
+: FTFont(pBufferBytes, bufferSizeInBytes)
 {
-    ;
+    impl = new FTGLOutlineFontImpl(pBufferBytes, bufferSizeInBytes);
 }
 
 
@@ -63,22 +63,6 @@ FTGLOutlineFont::~FTGLOutlineFont()
 //
 
 
-FTGLOutlineFontImpl::FTGLOutlineFontImpl(const char* fontFilePath)
-:   FTFontImpl(fontFilePath),
-    outset(0.0f)
-{}
-
-
-FTGLOutlineFontImpl::FTGLOutlineFontImpl(const unsigned char *pBufferBytes,
-                                         size_t bufferSizeInBytes)
-:   FTFontImpl(pBufferBytes, bufferSizeInBytes)
-{}
-
-
-FTGLOutlineFontImpl::~FTGLOutlineFontImpl()
-{}
-
-
 FTGlyph* FTGLOutlineFontImpl::MakeGlyph(unsigned int g)
 {
     FT_GlyphSlot ftGlyph = face.Glyph(g, FT_LOAD_NO_HINTING);
@@ -119,8 +103,20 @@ void FTGLOutlineFontImpl::Render(const char* string)
 }
 
 
+void FTGLOutlineFontImpl::Render(const char* string, int renderMode)
+{
+    RenderI(string);
+}
+
+
 void FTGLOutlineFontImpl::Render(const wchar_t* string)
 {
     RenderI(string);
 }
 
+
+void FTGLOutlineFontImpl::Render(const wchar_t* string, int renderMode)
+{
+    RenderI(string);
+}
+
diff --git a/src/FTGLOutlineFontImpl.h b/src/FTGLOutlineFontImpl.h
index a710a66..f8d4eda 100644
--- a/src/FTGLOutlineFontImpl.h
+++ b/src/FTGLOutlineFontImpl.h
@@ -35,13 +35,13 @@ class FTGLOutlineFontImpl : public FTFontImpl
 {
     friend class FTGLOutlineFont;
 
-    public:
-        FTGLOutlineFontImpl(const char* fontFilePath);
+    protected:
+        FTGLOutlineFontImpl(const char* fontFilePath) :
+            FTFontImpl(fontFilePath), outset(0.0f) {};
 
         FTGLOutlineFontImpl(const unsigned char *pBufferBytes,
-                            size_t bufferSizeInBytes);
-
-        ~FTGLOutlineFontImpl();
+                            size_t bufferSizeInBytes) :
+            FTFontImpl(pBufferBytes, bufferSizeInBytes), outset(0.0f) {};
 
         /**
          * Set the outset distance for the font. Only implemented by
@@ -49,14 +49,14 @@ class FTGLOutlineFontImpl : public FTFontImpl
          *
          * @param outset  The outset distance.
          */
-        void Outset(float o) { outset = o; }
+        virtual void Outset(float o) { outset = o; }
 
         /**
          * Renders a string of characters
          *
          * @param string    'C' style string to be output.
          */
-        void Render(const char* string);
+        virtual void Render(const char* string);
 
         /**
          * Render a string of characters
@@ -64,14 +64,14 @@ class FTGLOutlineFontImpl : public FTFontImpl
          * @param string    'C' style string to be output.
          * @param renderMode    Render mode to display
          */
-        void Render(const char* string, int renderMode) { Render(string); }
+        virtual void Render(const char* string, int renderMode);
 
         /**
          * Renders a string of characters
          *
          * @param string    wchar_t string to be output.
          */
-        void Render(const wchar_t* string);
+        virtual void Render(const wchar_t* string);
 
         /**
          * Render a string of characters
@@ -79,7 +79,7 @@ class FTGLOutlineFontImpl : public FTFontImpl
          * @param string    wchar_t string to be output.
          * @param renderMode    Render mode to display
          */
-        void Render(const wchar_t *string, int renderMode) { Render(string); }
+        virtual void Render(const wchar_t *string, int renderMode);
 
     private:
         /**
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index d1d1eb9..569f366 100644
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -37,18 +37,18 @@
 //
 
 
-FTGLPixmapFont::FTGLPixmapFont(char const *fontFilePath) :
-    FTFont(FTGL::FONT_PIXMAP, fontFilePath)
+FTGLPixmapFont::FTGLPixmapFont(char const *fontFilePath)
+: FTFont(fontFilePath)
 {
-    ;
+    impl = new FTGLPixmapFontImpl(fontFilePath);
 }
 
 
 FTGLPixmapFont::FTGLPixmapFont(const unsigned char *pBufferBytes,
-                               size_t bufferSizeInBytes) :
-    FTFont(FTGL::FONT_PIXMAP, pBufferBytes, bufferSizeInBytes)
+                               size_t bufferSizeInBytes)
+: FTFont(pBufferBytes, bufferSizeInBytes)
 {
-    ;
+    impl = new FTGLPixmapFontImpl(pBufferBytes, bufferSizeInBytes);
 }
 
 
@@ -63,27 +63,6 @@ FTGLPixmapFont::~FTGLPixmapFont()
 //
 
 
-FTGLPixmapFontImpl::FTGLPixmapFontImpl(const char* fontFilePath)
-:   FTFontImpl(fontFilePath)
-{
-    ;
-}
-
-
-FTGLPixmapFontImpl::FTGLPixmapFontImpl(const unsigned char *pBufferBytes,
-                                       size_t bufferSizeInBytes)
-:   FTFontImpl(pBufferBytes, bufferSizeInBytes)
-{
-    ;
-}
-
-
-FTGLPixmapFontImpl::~FTGLPixmapFontImpl()
-{
-    ;
-}
-
-
 FTGlyph* FTGLPixmapFontImpl::MakeGlyph(unsigned int g)
 {
     FT_GlyphSlot ftGlyph = face.Glyph(g, FT_LOAD_NO_HINTING
@@ -132,8 +111,20 @@ void FTGLPixmapFontImpl::Render(const char* string)
 }
 
 
+void FTGLPixmapFontImpl::Render(const char* string, int renderMode)
+{
+    RenderI(string);
+}
+
+
 void FTGLPixmapFontImpl::Render(const wchar_t* string)
 {
     RenderI(string);
 }
 
+
+void FTGLPixmapFontImpl::Render(const wchar_t* string, int renderMode)
+{
+    RenderI(string);
+}
+
diff --git a/src/FTGLPixmapFontImpl.h b/src/FTGLPixmapFontImpl.h
index ca06c66..8dcc978 100644
--- a/src/FTGLPixmapFontImpl.h
+++ b/src/FTGLPixmapFontImpl.h
@@ -35,20 +35,20 @@ class FTGLPixmapFontImpl : public FTFontImpl
 {
     friend class FTGLPixmapFont;
 
-    public:
-        FTGLPixmapFontImpl(const char* fontFilePath);
+    protected:
+        FTGLPixmapFontImpl(const char* fontFilePath) :
+            FTFontImpl(fontFilePath) {};
 
         FTGLPixmapFontImpl(const unsigned char *pBufferBytes,
-                           size_t bufferSizeInBytes);
-
-        ~FTGLPixmapFontImpl();
+                           size_t bufferSizeInBytes) :
+            FTFontImpl(pBufferBytes, bufferSizeInBytes) {};
 
         /**
          * Renders a string of characters
          *
          * @param string    'C' style string to be output.
          */
-        void Render(const char* string);
+        virtual void Render(const char* string);
 
         /**
          * Render a string of characters
@@ -56,14 +56,14 @@ class FTGLPixmapFontImpl : public FTFontImpl
          * @param string    'C' style string to be output.
          * @param renderMode    Render mode to display
          */
-        void Render(const char* string, int renderMode) { Render(string); }
+        virtual void Render(const char* string, int renderMode);
 
         /**
          * Renders a string of characters
          *
          * @param string    wchar_t string to be output.
          */
-        void Render(const wchar_t* string);
+        virtual void Render(const wchar_t* string);
 
         /**
          * Render a string of characters
@@ -71,7 +71,7 @@ class FTGLPixmapFontImpl : public FTFontImpl
          * @param string    wchar_t string to be output.
          * @param renderMode    Render mode to display
          */
-        void Render(const wchar_t *string, int renderMode) { Render(string); }
+        virtual void Render(const wchar_t *string, int renderMode);
 
     private:
         /**
diff --git a/src/FTGLPolygonFont.cpp b/src/FTGLPolygonFont.cpp
index cb85688..638701e 100644
--- a/src/FTGLPolygonFont.cpp
+++ b/src/FTGLPolygonFont.cpp
@@ -37,18 +37,18 @@
 //
 
 
-FTGLPolygonFont::FTGLPolygonFont(char const *fontFilePath) :
-    FTFont(FTGL::FONT_POLYGON, fontFilePath)
+FTGLPolygonFont::FTGLPolygonFont(char const *fontFilePath)
+: FTFont(fontFilePath)
 {
-    ;
+    impl = new FTGLPolygonFontImpl(fontFilePath);
 }
 
 
 FTGLPolygonFont::FTGLPolygonFont(const unsigned char *pBufferBytes,
-                                 size_t bufferSizeInBytes) :
-    FTFont(FTGL::FONT_POLYGON, pBufferBytes, bufferSizeInBytes)
+                                 size_t bufferSizeInBytes)
+: FTFont(pBufferBytes, bufferSizeInBytes)
 {
-    ;
+    impl = new FTGLPolygonFontImpl(pBufferBytes, bufferSizeInBytes);
 }
 
 
@@ -63,28 +63,6 @@ FTGLPolygonFont::~FTGLPolygonFont()
 //
 
 
-FTGLPolygonFontImpl::FTGLPolygonFontImpl(const char* fontFilePath)
-:   FTFontImpl(fontFilePath),
-    outset(0.0f)
-{
-    ;
-}
-
-
-FTGLPolygonFontImpl::FTGLPolygonFontImpl(const unsigned char *pBufferBytes,
-                                         size_t bufferSizeInBytes)
-:   FTFontImpl(pBufferBytes, bufferSizeInBytes)
-{
-    ;
-}
-
-
-FTGLPolygonFontImpl::~FTGLPolygonFontImpl()
-{
-    ;
-}
-
-
 FTGlyph* FTGLPolygonFontImpl::MakeGlyph(unsigned int g)
 {
     FT_GlyphSlot ftGlyph = face.Glyph(g, FT_LOAD_NO_HINTING);
diff --git a/src/FTGLPolygonFontImpl.h b/src/FTGLPolygonFontImpl.h
index ffa9150..eb38ae2 100644
--- a/src/FTGLPolygonFontImpl.h
+++ b/src/FTGLPolygonFontImpl.h
@@ -35,13 +35,13 @@ class FTGLPolygonFontImpl : public FTFontImpl
 {
     friend class FTGLPolygonFont;
 
-    public:
-        FTGLPolygonFontImpl(const char* fontFilePath);
+    protected:
+        FTGLPolygonFontImpl(const char* fontFilePath) :
+            FTFontImpl(fontFilePath), outset(0.0f) {};
 
         FTGLPolygonFontImpl(const unsigned char *pBufferBytes,
-                            size_t bufferSizeInBytes);
-
-        ~FTGLPolygonFontImpl();
+                            size_t bufferSizeInBytes) :
+            FTFontImpl(pBufferBytes, bufferSizeInBytes), outset(0.0f) {};
 
         /**
          * Set the outset distance for the font. Only implemented by
@@ -49,7 +49,7 @@ class FTGLPolygonFontImpl : public FTFontImpl
          *
          * @param depth  The outset distance.
          */
-        void Outset(float o) { outset = o; }
+        virtual void Outset(float o) { outset = o; }
 
     private:
         /**
@@ -58,7 +58,7 @@ class FTGLPolygonFontImpl : public FTFontImpl
          * @param g The glyph index NOT the char code.
          * @return  An FTPolyGlyph or <code>null</code> on failure.
          */
-        inline virtual FTGlyph* MakeGlyph(unsigned int g);
+        virtual FTGlyph* MakeGlyph(unsigned int g);
 
         /**
          * The outset distance (front and back) for the font.
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 561bb0b..7fe49cf 100644
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -40,18 +40,18 @@
 //
 
 
-FTGLTextureFont::FTGLTextureFont(char const *fontFilePath) :
-    FTFont(FTGL::FONT_TEXTURE, fontFilePath)
+FTGLTextureFont::FTGLTextureFont(char const *fontFilePath)
+: FTFont(fontFilePath)
 {
-    ;
+    impl = new FTGLTextureFontImpl(fontFilePath);
 }
 
 
 FTGLTextureFont::FTGLTextureFont(const unsigned char *pBufferBytes,
-                                 size_t bufferSizeInBytes) :
-    FTFont(FTGL::FONT_TEXTURE, pBufferBytes, bufferSizeInBytes)
+                                 size_t bufferSizeInBytes)
+: FTFont(pBufferBytes, bufferSizeInBytes)
 {
-    ;
+    impl = new FTGLTextureFontImpl(pBufferBytes, bufferSizeInBytes);
 }
 
 
@@ -233,8 +233,20 @@ void FTGLTextureFontImpl::Render(const char* string)
 }
 
 
+void FTGLTextureFontImpl::Render(const char* string, int renderMode)
+{
+    RenderI(string);
+}
+
+
 void FTGLTextureFontImpl::Render(const wchar_t* string)
 {
     RenderI(string);
 }
 
+
+void FTGLTextureFontImpl::Render(const wchar_t* string, int renderMode)
+{
+    RenderI(string);
+}
+
diff --git a/src/FTGLTextureFontImpl.h b/src/FTGLTextureFontImpl.h
index b6b2120..28d14cc 100644
--- a/src/FTGLTextureFontImpl.h
+++ b/src/FTGLTextureFontImpl.h
@@ -37,13 +37,13 @@ class FTGLTextureFontImpl : public FTFontImpl
 {
     friend class FTGLTextureFont;
 
-    public:
+    protected:
         FTGLTextureFontImpl(const char* fontFilePath);
 
         FTGLTextureFontImpl(const unsigned char *pBufferBytes,
                             size_t bufferSizeInBytes);
 
-        ~FTGLTextureFontImpl();
+        virtual ~FTGLTextureFontImpl();
 
         /**
          * Set the char size for the current face.
@@ -68,7 +68,7 @@ class FTGLTextureFontImpl : public FTFontImpl
          * @param string    'C' style string to be output.
          * @param renderMode    Render mode to display
          */
-        void Render(const char* string, int renderMode) { Render(string); }
+        virtual void Render(const char* string, int renderMode);
 
         /**
          * Renders a string of characters
@@ -83,7 +83,7 @@ class FTGLTextureFontImpl : public FTFontImpl
          * @param string    wchar_t string to be output.
          * @param renderMode    Render mode to display
          */
-        void Render(const wchar_t *string, int renderMode) { Render(string); }
+        virtual void Render(const wchar_t *string, int renderMode);
 
     private:
         /**
diff --git a/src/FTInternals.h b/src/FTInternals.h
index 0b58c51..dce6887 100644
--- a/src/FTInternals.h
+++ b/src/FTInternals.h
@@ -90,12 +90,27 @@
 
 FTGL_BEGIN_C_DECLS
 
+typedef enum
+{
+    FONT_BITMAP,
+    FONT_PIXMAP,
+    FONT_OUTLINE,
+    FONT_POLYGON,
+    FONT_EXTRUDE,
+    FONT_TEXTURE,
+} FontType;
+
 struct _FTGLfont
 {
     FTFont *ptr;
     FTGL::FontType type;
 };
 
+typedef enum
+{
+    LAYOUT_SIMPLE,
+} LayoutType;
+
 struct _FTGLlayout
 {
     FTLayout *ptr;
diff --git a/src/FTLayout.cpp b/src/FTLayout.cpp
index 0b569e9..be752b9 100644
--- a/src/FTLayout.cpp
+++ b/src/FTLayout.cpp
@@ -40,19 +40,17 @@
 //
 
 
-FTLayout::FTLayout(FTGL::LayoutType type)
+FTLayout::FTLayout()
 {
-    switch(type)
-    {
-        case FTGL::LAYOUT_SIMPLE:
-            impl = new FTSimpleLayoutImpl();
-            break;
-    }
+    /* impl is set by the child class */
+    impl = NULL;
 }
 
 
 FTLayout::~FTLayout()
 {
+    /* Only the top class should be allowed to destroy impl, because
+     * we do not know how many levels of inheritance there are. */
     delete impl;
 }
 
diff --git a/src/FTSimpleLayout.cpp b/src/FTSimpleLayout.cpp
index 4224de4..a8af1cb 100644
--- a/src/FTSimpleLayout.cpp
+++ b/src/FTSimpleLayout.cpp
@@ -42,10 +42,9 @@
 //
 
 
-FTSimpleLayout::FTSimpleLayout() :
-    FTLayout(FTGL::LAYOUT_SIMPLE)
+FTSimpleLayout::FTSimpleLayout()
 {
-    ;
+    impl = new FTSimpleLayoutImpl();
 }
 
 
diff --git a/src/FTSimpleLayoutImpl.h b/src/FTSimpleLayoutImpl.h
index ccad087..045a30a 100644
--- a/src/FTSimpleLayoutImpl.h
+++ b/src/FTSimpleLayoutImpl.h
@@ -37,10 +37,10 @@ class FTSimpleLayoutImpl : public FTLayoutImpl
 {
     friend class FTSimpleLayout;
 
-    public:
+    protected:
         FTSimpleLayoutImpl();
 
-        ~FTSimpleLayoutImpl();
+        virtual ~FTSimpleLayoutImpl() {};
 
         /**
          * Get the bounding box for a string.