kc3-lang/ftgl

diff --git a/src/FTFont/FTBitmapFont.cpp b/src/FTFont/FTBitmapFont.cpp
index 475ae20..da86613 100644
--- a/src/FTFont/FTBitmapFont.cpp
+++ b/src/FTFont/FTBitmapFont.cpp
@@ -36,23 +36,19 @@
 //
 
 
-FTBitmapFont::FTBitmapFont(char const *fontFilePath)
-{
-    impl = new FTBitmapFontImpl(this, fontFilePath);
-}
+FTBitmapFont::FTBitmapFont(char const *fontFilePath) :
+    FTFont(new FTBitmapFontImpl(this, fontFilePath))
+{}
 
 
 FTBitmapFont::FTBitmapFont(unsigned char const *pBufferBytes,
-                           size_t bufferSizeInBytes)
-{
-    impl = new FTBitmapFontImpl(this, pBufferBytes, bufferSizeInBytes);
-}
+                           size_t bufferSizeInBytes) :
+    FTFont(new FTBitmapFontImpl(this, pBufferBytes, bufferSizeInBytes))
+{}
 
 
 FTBitmapFont::~FTBitmapFont()
-{
-    ;
-}
+{}
 
 
 FTGlyph* FTBitmapFont::MakeGlyph(FT_GlyphSlot ftGlyph)
diff --git a/src/FTFont/FTExtrudeFont.cpp b/src/FTFont/FTExtrudeFont.cpp
index 7f251dc..497af7e 100644
--- a/src/FTFont/FTExtrudeFont.cpp
+++ b/src/FTFont/FTExtrudeFont.cpp
@@ -36,23 +36,20 @@
 //
 
 
-FTExtrudeFont::FTExtrudeFont(char const *fontFilePath)
-{
-    impl = new FTExtrudeFontImpl(this, fontFilePath);
-}
+FTExtrudeFont::FTExtrudeFont(char const *fontFilePath) :
+    FTFont(new FTExtrudeFontImpl(this, fontFilePath))
+{}
 
 
 FTExtrudeFont::FTExtrudeFont(const unsigned char *pBufferBytes,
-                             size_t bufferSizeInBytes)
-{
-    impl = new FTExtrudeFontImpl(this, pBufferBytes, bufferSizeInBytes);
-}
+                             size_t bufferSizeInBytes) :
+    FTFont(new FTExtrudeFontImpl(this, pBufferBytes, bufferSizeInBytes))
+
+{}
 
 
 FTExtrudeFont::~FTExtrudeFont()
-{
-    ;
-}
+{}
 
 
 FTGlyph* FTExtrudeFont::MakeGlyph(FT_GlyphSlot ftGlyph)
diff --git a/src/FTFont/FTFont.cpp b/src/FTFont/FTFont.cpp
index c8c9819..a971030 100644
--- a/src/FTFont/FTFont.cpp
+++ b/src/FTFont/FTFont.cpp
@@ -45,17 +45,26 @@
 //
 
 
-FTFont::FTFont()
+FTFont::FTFont(char const *fontFilePath)
 {
-    /* impl is set by the child class */
-    impl = NULL;
+    impl = new FTFontImpl(this, fontFilePath);
+}
+
+
+FTFont::FTFont(const unsigned char *pBufferBytes, size_t bufferSizeInBytes)
+{
+    impl = new FTFontImpl(this, pBufferBytes, bufferSizeInBytes);
+}
+
+
+FTFont::FTFont(FTFontImpl *pImpl)
+{
+    impl = pImpl;
 }
 
 
 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;
 }
 
@@ -339,6 +348,12 @@ bool FTFontImpl::Attach(const unsigned char *pBufferBytes,
 
 bool FTFontImpl::FaceSize(const unsigned int size, const unsigned int res)
 {
+    if(glyphList != NULL)
+    {
+        delete glyphList;
+        glyphList = NULL;
+    }
+
     charSize = face.Size(size, res);
     err = face.Error();
 
@@ -347,11 +362,6 @@ bool FTFontImpl::FaceSize(const unsigned int size, const unsigned int res)
         return false;
     }
 
-    if(glyphList != NULL)
-    {
-        delete glyphList;
-    }
-
     glyphList = new FTGlyphContainer(&face);
     return true;
 }
diff --git a/src/FTFont/FTOutlineFont.cpp b/src/FTFont/FTOutlineFont.cpp
index 0d7a582..05a7ed8 100644
--- a/src/FTFont/FTOutlineFont.cpp
+++ b/src/FTFont/FTOutlineFont.cpp
@@ -36,23 +36,19 @@
 //
 
 
-FTOutlineFont::FTOutlineFont(char const *fontFilePath)
-{
-    impl = new FTOutlineFontImpl(this, fontFilePath);
-}
+FTOutlineFont::FTOutlineFont(char const *fontFilePath) :
+    FTFont(new FTOutlineFontImpl(this, fontFilePath))
+{}
 
 
 FTOutlineFont::FTOutlineFont(const unsigned char *pBufferBytes,
-                             size_t bufferSizeInBytes)
-{
-    impl = new FTOutlineFontImpl(this, pBufferBytes, bufferSizeInBytes);
-}
+                             size_t bufferSizeInBytes) :
+    FTFont(new FTOutlineFontImpl(this, pBufferBytes, bufferSizeInBytes))
+{}
 
 
 FTOutlineFont::~FTOutlineFont()
-{
-    ;
-}
+{}
 
 
 FTGlyph* FTOutlineFont::MakeGlyph(FT_GlyphSlot ftGlyph)
diff --git a/src/FTFont/FTPixmapFont.cpp b/src/FTFont/FTPixmapFont.cpp
index 4c62f13..58ca566 100644
--- a/src/FTFont/FTPixmapFont.cpp
+++ b/src/FTFont/FTPixmapFont.cpp
@@ -36,23 +36,19 @@
 //
 
 
-FTPixmapFont::FTPixmapFont(char const *fontFilePath)
-{
-    impl = new FTPixmapFontImpl(this, fontFilePath);
-}
+FTPixmapFont::FTPixmapFont(char const *fontFilePath) :
+    FTFont(new FTPixmapFontImpl(this, fontFilePath))
+{}
 
 
 FTPixmapFont::FTPixmapFont(const unsigned char *pBufferBytes,
-                           size_t bufferSizeInBytes)
-{
-    impl = new FTPixmapFontImpl(this, pBufferBytes, bufferSizeInBytes);
-}
+                           size_t bufferSizeInBytes) :
+    FTFont(new FTPixmapFontImpl(this, pBufferBytes, bufferSizeInBytes))
+{}
 
 
 FTPixmapFont::~FTPixmapFont()
-{
-    ;
-}
+{}
 
 
 FTGlyph* FTPixmapFont::MakeGlyph(FT_GlyphSlot ftGlyph)
diff --git a/src/FTFont/FTPolygonFont.cpp b/src/FTFont/FTPolygonFont.cpp
index 7ab7726..271455a 100644
--- a/src/FTFont/FTPolygonFont.cpp
+++ b/src/FTFont/FTPolygonFont.cpp
@@ -36,23 +36,19 @@
 //
 
 
-FTPolygonFont::FTPolygonFont(char const *fontFilePath)
-{
-    impl = new FTPolygonFontImpl(this, fontFilePath);
-}
+FTPolygonFont::FTPolygonFont(char const *fontFilePath) :
+    FTFont(new FTPolygonFontImpl(this, fontFilePath))
+{}
 
 
 FTPolygonFont::FTPolygonFont(const unsigned char *pBufferBytes,
-                             size_t bufferSizeInBytes)
-{
-    impl = new FTPolygonFontImpl(this, pBufferBytes, bufferSizeInBytes);
-}
+                             size_t bufferSizeInBytes) :
+    FTFont(new FTPolygonFontImpl(this, pBufferBytes, bufferSizeInBytes))
+{}
 
 
 FTPolygonFont::~FTPolygonFont()
-{
-    ;
-}
+{}
 
 
 FTGlyph* FTPolygonFont::MakeGlyph(FT_GlyphSlot ftGlyph)
diff --git a/src/FTFont/FTTextureFont.cpp b/src/FTFont/FTTextureFont.cpp
index e74f624..33ceae4 100644
--- a/src/FTFont/FTTextureFont.cpp
+++ b/src/FTFont/FTTextureFont.cpp
@@ -41,23 +41,19 @@
 //
 
 
-FTTextureFont::FTTextureFont(char const *fontFilePath)
-{
-    impl = new FTTextureFontImpl(this, fontFilePath);
-}
+FTTextureFont::FTTextureFont(char const *fontFilePath) :
+    FTFont(new FTTextureFontImpl(this, fontFilePath))
+{}
 
 
 FTTextureFont::FTTextureFont(const unsigned char *pBufferBytes,
-                             size_t bufferSizeInBytes)
-{
-    impl = new FTTextureFontImpl(this, pBufferBytes, bufferSizeInBytes);
-}
+                             size_t bufferSizeInBytes) :
+    FTFont(new FTTextureFontImpl(this, pBufferBytes, bufferSizeInBytes))
+{}
 
 
 FTTextureFont::~FTTextureFont()
-{
-    ;
-}
+{}
 
 
 FTGlyph* FTTextureFont::MakeGlyph(FT_GlyphSlot ftGlyph)
diff --git a/src/FTGL/FTBitmapGlyph.h b/src/FTGL/FTBitmapGlyph.h
index d522dc9..f8ef87f 100644
--- a/src/FTGL/FTBitmapGlyph.h
+++ b/src/FTGL/FTBitmapGlyph.h
@@ -38,8 +38,6 @@
 
 /**
  * FTBitmapGlyph is a specialisation of FTGlyph for creating bitmaps.
- *
- * @see FTGlyphContainer
  */
 class FTGL_EXPORT FTBitmapGlyph : public FTGlyph
 {
@@ -55,6 +53,15 @@ class FTGL_EXPORT FTBitmapGlyph : public FTGlyph
          * Destructor
          */
         virtual ~FTBitmapGlyph();
+
+        /**
+         * Render this glyph at the current pen position.
+         *
+         * @param pen  The current pen position.
+         * @param renderMode  Render mode to display
+         * @return  The advance distance for this glyph.
+         */
+        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
 };
 
 #endif //__cplusplus
diff --git a/src/FTGL/FTExtrdGlyph.h b/src/FTGL/FTExtrdGlyph.h
index 7f0ad73..c1eaa54 100644
--- a/src/FTGL/FTExtrdGlyph.h
+++ b/src/FTGL/FTExtrdGlyph.h
@@ -39,10 +39,6 @@
 /**
  * FTExtrudeGlyph is a specialisation of FTGlyph for creating tessellated
  * extruded polygon glyphs.
- *
- * @see FTGlyphContainer
- * @see FTVectoriser
- *
  */
 class FTGL_EXPORT FTExtrudeGlyph : public FTGlyph
 {
@@ -67,6 +63,15 @@ class FTGL_EXPORT FTExtrudeGlyph : public FTGlyph
          * Destructor
          */
         virtual ~FTExtrudeGlyph();
+
+        /**
+         * Render this glyph at the current pen position.
+         *
+         * @param pen  The current pen position.
+         * @param renderMode  Render mode to display
+         * @return  The advance distance for this glyph.
+         */
+        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
 };
 
 #define FTExtrdGlyph FTExtrudeGlyph
diff --git a/src/FTGL/FTFont.h b/src/FTGL/FTFont.h
index 14e2e01..3ba7c0f 100644
--- a/src/FTGL/FTFont.h
+++ b/src/FTGL/FTFont.h
@@ -55,12 +55,40 @@ class FTFontImpl;
  */
 class FTGL_EXPORT FTFont
 {
-        /* Allow FTLayout classes to access this->impl. */
-        friend class FTLayoutImpl;
-        friend class FTFontImpl;
-
     protected:
-        FTFont();
+        /**
+         * Open and read a font file. Sets Error flag.
+         *
+         * @param fontFilePath  font file path.
+         */
+        FTFont(char const *fontFilePath);
+
+        /**
+         * Open and read a font from a buffer in memory. Sets Error flag.
+         * The buffer is owned by the client and is NOT copied by FTGL. The
+         * pointer must be valid while using FTGL.
+         *
+         * @param pBufferBytes  the in-memory buffer
+         * @param bufferSizeInBytes  the length of the buffer in bytes
+         */
+        FTFont(const unsigned char *pBufferBytes, size_t bufferSizeInBytes);
+
+    private:
+        /* Allow our internal subclasses to access the private constructor */
+        friend class FTBitmapFont;
+        friend class FTExtrudeFont;
+        friend class FTOutlineFont;
+        friend class FTPixmapFont;
+        friend class FTPolygonFont;
+        friend class FTTextureFont;
+
+        /**
+         * Internal FTGL FTFont constructor. For private use only.
+         *
+         * @param pImpl  Internal implementation object. Will be destroyed
+         *               upon FTFont deletion.
+         */
+        FTFont(FTFontImpl *pImpl);
 
     public:
         virtual ~FTFont();
@@ -304,6 +332,9 @@ class FTGL_EXPORT FTFont
         FT_Error Error() const;
 
     protected:
+        /* Allow impl to access MakeGlyph */
+        friend class FTFontImpl;
+
         /**
          * Construct a glyph of the correct type.
          *
@@ -315,6 +346,13 @@ class FTGL_EXPORT FTFont
          */
         virtual FTGlyph* MakeGlyph(FT_GlyphSlot slot) = 0;
 
+    private:
+        /* Allow FTLayout classes to access this->impl. */
+        friend class FTLayoutImpl;
+
+        /**
+         * Internal FTGL FTFont implementation object. For private use only.
+         */
         FTFontImpl *impl;
 };
 
diff --git a/src/FTGL/FTGlyph.h b/src/FTGL/FTGlyph.h
index 7b7c0f1..26ca5d1 100644
--- a/src/FTGL/FTGlyph.h
+++ b/src/FTGL/FTGlyph.h
@@ -42,31 +42,52 @@ class FTGlyphImpl;
  *
  * It provides the interface between Freetype glyphs and their openGL
  * renderable counterparts. This is an abstract class and derived classes
- * must implement the <code>render</code> function.
+ * must implement the <code>Render</code> function.
  *
- * @see FTGlyphContainer
  * @see FTBBox
  * @see FTPoint
- *
  */
 class FTGL_EXPORT FTGlyph
 {
-    friend class FTGlyphContainer;
-
     protected:
-        FTGlyph();
+        /**
+         * Create a glyph.
+         *
+         * @param glyph  The Freetype glyph to be processed
+         */
+        FTGlyph(FT_GlyphSlot glyph);
+
+    private:
+        /**
+         * Internal FTGL FTGlyph constructor. For private use only.
+         *
+         * @param pImpl  Internal implementation object. Will be destroyed
+         *               upon FTGlyph deletion.
+         */
+        FTGlyph(FTGlyphImpl *pImpl);
+
+        /* Allow our internal subclasses to access the private constructor */
+        friend class FTBitmapGlyph;
+        friend class FTExtrudeGlyph;
+        friend class FTOutlineGlyph;
+        friend class FTPixmapGlyph;
+        friend class FTPolygonGlyph;
+        friend class FTTextureGlyph;
 
     public:
+        /**
+          * Destructor
+          */
         virtual ~FTGlyph();
 
         /**
          * Renders this glyph at the current pen position.
          *
-         * @param pen   The current pen position.
-         * @param renderMode Render mode to display
-         * @return      The advance distance for this glyph.
+         * @param pen  The current pen position.
+         * @param renderMode  Render mode to display
+         * @return  The advance distance for this glyph.
          */
-        const FTPoint& Render(const FTPoint& pen, int renderMode);
+        virtual const FTPoint& Render(const FTPoint& pen, int renderMode) = 0;
 
         /**
          * Return the advance width for this glyph.
@@ -89,7 +110,10 @@ class FTGL_EXPORT FTGlyph
          */
         FT_Error Error() const;
 
-    protected:
+    private:
+        /**
+         * Internal FTGL FTGlyph implementation object. For private use only.
+         */
         FTGlyphImpl *impl;
 };
 
diff --git a/src/FTGL/FTLayout.h b/src/FTGL/FTLayout.h
index a5b88aa..a207b0e 100644
--- a/src/FTGL/FTLayout.h
+++ b/src/FTGL/FTLayout.h
@@ -53,26 +53,93 @@ class FTGL_EXPORT FTLayout
     protected:
         FTLayout();
 
+    private:
+        /**
+         * Internal FTGL FTLayout constructor. For private use only.
+         *
+         * @param pImpl  Internal implementation object. Will be destroyed
+         *               upon FTLayout deletion.
+         */
+        FTLayout(FTLayoutImpl *pImpl);
+
+        /* Allow our internal subclasses to access the private constructor */
+        friend class FTSimpleLayout;
+
     public:
+        /**
+         * Destructor
+         */
         virtual ~FTLayout();
 
-        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);
-
-        void Render(const char *string);
-
-        void Render(const char *string, int renderMode);
-
-        void Render(const wchar_t *string);
-
-        void Render(const wchar_t *string, int renderMode);
-
+        /**
+         * Get the bounding box for a formatted string.
+         *
+         * @param string    a char string
+         * @param llx       lower left near x coord
+         * @param lly       lower left near y coord
+         * @param llz       lower left near z coord
+         * @param urx       upper right far x coord
+         * @param ury       upper right far y coord
+         * @param urz       upper right far z coord
+         */
+        virtual void BBox(const char* string, float& llx, float& lly,
+                          float& llz, float& urx, float& ury, float& urz) = 0;
+
+        /**
+         * Get the bounding box for a formatted string.
+         *
+         * @param string    a wchar_t string
+         * @param llx       lower left near x coord
+         * @param lly       lower left near y coord
+         * @param llz       lower left near z coord
+         * @param urx       upper right far x coord
+         * @param ury       upper right far y coord
+         * @param urz       upper right far z coord
+         */
+        virtual void BBox(const wchar_t* string, float& llx, float& lly,
+                          float& llz, float& urx, float& ury, float& urz) = 0;
+
+        /**
+         * Render a string of characters
+         *
+         * @param string    'C' style string to be output.
+         */
+        virtual void Render(const char *string) = 0;
+
+        /**
+         * Render a string of characters
+         *
+         * @param string    'C' style string to be output.
+         * @param renderMode  Render mode to diplay
+         */
+        virtual void Render(const char *string, int renderMode) = 0;
+
+        /**
+         * Render a string of characters
+         *
+         * @param string    wchar_t string to be output.
+         */
+        virtual void Render(const wchar_t *string) = 0;
+
+        /**
+         * Render a string of characters
+         *
+         * @param string    wchar_t string to be output.
+         * @param renderMode  Render mode to diplay
+         */
+        virtual void Render(const wchar_t *string, int renderMode) = 0;
+
+        /**
+         * Queries the Layout for errors.
+         *
+         * @return  The current error code.
+         */
         FT_Error Error() const;
 
-    protected:
+    private:
+        /**
+         * Internal FTGL FTLayout implementation object. For private use only.
+         */
         FTLayoutImpl *impl;
 };
 
diff --git a/src/FTGL/FTOutlineGlyph.h b/src/FTGL/FTOutlineGlyph.h
index 03e0438..2919139 100644
--- a/src/FTGL/FTOutlineGlyph.h
+++ b/src/FTGL/FTOutlineGlyph.h
@@ -38,10 +38,6 @@
 
 /**
  * FTOutlineGlyph is a specialisation of FTGlyph for creating outlines.
- *
- * @see FTGlyphContainer
- * @see FTVectoriser
- *
  */
 class FTGL_EXPORT FTOutlineGlyph : public FTGlyph
 {
@@ -63,6 +59,15 @@ class FTGL_EXPORT FTOutlineGlyph : public FTGlyph
          * Destructor
          */
         virtual ~FTOutlineGlyph();
+
+        /**
+         * Render this glyph at the current pen position.
+         *
+         * @param pen  The current pen position.
+         * @param renderMode  Render mode to display
+         * @return  The advance distance for this glyph.
+         */
+        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
 };
 
 #endif //__cplusplus
diff --git a/src/FTGL/FTPixmapGlyph.h b/src/FTGL/FTPixmapGlyph.h
index 672f0d5..d9a317f 100644
--- a/src/FTGL/FTPixmapGlyph.h
+++ b/src/FTGL/FTPixmapGlyph.h
@@ -38,9 +38,6 @@
 
 /**
  * FTPixmapGlyph is a specialisation of FTGlyph for creating pixmaps.
- *
- * @see FTGlyphContainer
- *
  */
 class  FTGL_EXPORT FTPixmapGlyph : public FTGlyph
 {
@@ -56,6 +53,15 @@ class  FTGL_EXPORT FTPixmapGlyph : public FTGlyph
          * Destructor
          */
         virtual ~FTPixmapGlyph();
+
+        /**
+         * Render this glyph at the current pen position.
+         *
+         * @param pen  The current pen position.
+         * @param renderMode  Render mode to display
+         * @return  The advance distance for this glyph.
+         */
+        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
 };
 
 #endif //__cplusplus
diff --git a/src/FTGL/FTPolyGlyph.h b/src/FTGL/FTPolyGlyph.h
index 41f1601..315972f 100644
--- a/src/FTGL/FTPolyGlyph.h
+++ b/src/FTGL/FTPolyGlyph.h
@@ -39,10 +39,6 @@
 /**
  * FTPolygonGlyph is a specialisation of FTGlyph for creating tessellated
  * polygon glyphs.
- *
- * @see FTGlyphContainer
- * @see FTVectoriser
- *
  */
 class FTGL_EXPORT FTPolygonGlyph : public FTGlyph
 {
@@ -64,6 +60,15 @@ class FTGL_EXPORT FTPolygonGlyph : public FTGlyph
          * Destructor
          */
         virtual ~FTPolygonGlyph();
+
+        /**
+         * Render this glyph at the current pen position.
+         *
+         * @param pen  The current pen position.
+         * @param renderMode  Render mode to display
+         * @return  The advance distance for this glyph.
+         */
+        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
 };
 
 #define FTPolyGlyph FTPolygonGlyph
diff --git a/src/FTGL/FTSimpleLayout.h b/src/FTGL/FTSimpleLayout.h
index 646da63..7396190 100644
--- a/src/FTGL/FTSimpleLayout.h
+++ b/src/FTGL/FTSimpleLayout.h
@@ -58,7 +58,65 @@ class FTGL_EXPORT FTSimpleLayout : public FTLayout
         /**
          * Destructor
          */
-        ~FTSimpleLayout() {}
+        ~FTSimpleLayout();
+
+        /**
+         * Get the bounding box for a formatted string.
+         *
+         * @param string    a char string
+         * @param llx       lower left near x coord
+         * @param lly       lower left near y coord
+         * @param llz       lower left near z coord
+         * @param urx       upper right far x coord
+         * @param ury       upper right far y coord
+         * @param urz       upper right far z coord
+         */
+        virtual void BBox(const char* string, float& llx, float& lly,
+                          float& llz, float& urx, float& ury, float& urz);
+
+        /**
+         * Get the bounding box for a formatted string.
+         *
+         * @param string    a wchar_t string
+         * @param llx       lower left near x coord
+         * @param lly       lower left near y coord
+         * @param llz       lower left near z coord
+         * @param urx       upper right far x coord
+         * @param ury       upper right far y coord
+         * @param urz       upper right far z coord
+         */
+        virtual void BBox(const wchar_t* string, float& llx, float& lly,
+                          float& llz, float& urx, float& ury, float& urz);
+
+        /**
+         * Render a string of characters
+         *
+         * @param string    'C' style string to be output.
+         */
+        virtual void Render(const char *string);
+
+        /**
+         * Render a string of characters
+         *
+         * @param string    'C' style string to be output.
+         * @param renderMode  Render mode to diplay
+         */
+        virtual void Render(const char *string, int renderMode);
+
+        /**
+         * Render a string of characters
+         *
+         * @param string    wchar_t string to be output.
+         */
+        virtual void Render(const wchar_t *string);
+
+        /**
+         * Render a string of characters
+         *
+         * @param string    wchar_t string to be output.
+         * @param renderMode  Render mode to diplay
+         */
+        virtual void Render(const wchar_t *string, int renderMode);
 
         /**
          * Set the font to use for rendering the text.
diff --git a/src/FTGL/FTTextureGlyph.h b/src/FTGL/FTTextureGlyph.h
index 1e4956a..ec545f3 100644
--- a/src/FTGL/FTTextureGlyph.h
+++ b/src/FTGL/FTTextureGlyph.h
@@ -39,9 +39,6 @@
 /**
  * FTTextureGlyph is a specialisation of FTGlyph for creating texture
  * glyphs.
- *
- * @see FTGlyphContainer
- *
  */
 class FTGL_EXPORT FTTextureGlyph : public FTGlyph
 {
@@ -66,6 +63,15 @@ class FTGL_EXPORT FTTextureGlyph : public FTGlyph
          * Destructor
          */
         virtual ~FTTextureGlyph();
+
+        /**
+         * Render this glyph at the current pen position.
+         *
+         * @param pen  The current pen position.
+         * @param renderMode  Render mode to display
+         * @return  The advance distance for this glyph.
+         */
+        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
 };
 
 #endif //__cplusplus
diff --git a/src/FTGlyph/FTBitmapGlyph.cpp b/src/FTGlyph/FTBitmapGlyph.cpp
index 4981586..cda8ac8 100644
--- a/src/FTGlyph/FTBitmapGlyph.cpp
+++ b/src/FTGlyph/FTBitmapGlyph.cpp
@@ -38,15 +38,19 @@
 //
 
 
-FTBitmapGlyph::FTBitmapGlyph(FT_GlyphSlot glyph)
-{
-    impl = new FTBitmapGlyphImpl(glyph);
-}
+FTBitmapGlyph::FTBitmapGlyph(FT_GlyphSlot glyph) :
+    FTGlyph(new FTBitmapGlyphImpl(glyph))
+{}
 
 
 FTBitmapGlyph::~FTBitmapGlyph()
+{}
+
+
+const FTPoint& FTBitmapGlyph::Render(const FTPoint& pen, int renderMode)
 {
-    ;
+    FTBitmapGlyphImpl *myimpl = dynamic_cast<FTBitmapGlyphImpl *>(impl);
+    return myimpl->RenderImpl(pen, renderMode);
 }
 
 
@@ -102,7 +106,7 @@ FTBitmapGlyphImpl::~FTBitmapGlyphImpl()
 }
 
 
-const FTPoint& FTBitmapGlyphImpl::Render(const FTPoint& pen, int renderMode)
+const FTPoint& FTBitmapGlyphImpl::RenderImpl(const FTPoint& pen, int renderMode)
 {
     if(data)
     {
diff --git a/src/FTGlyph/FTBitmapGlyphImpl.h b/src/FTGlyph/FTBitmapGlyphImpl.h
index 3178834..3601f44 100644
--- a/src/FTGlyph/FTBitmapGlyphImpl.h
+++ b/src/FTGlyph/FTBitmapGlyphImpl.h
@@ -37,7 +37,7 @@ class FTBitmapGlyphImpl : public FTGlyphImpl
 
         virtual ~FTBitmapGlyphImpl();
 
-        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
+        virtual const FTPoint& RenderImpl(const FTPoint& pen, int renderMode);
 
     private:
         /**
diff --git a/src/FTGlyph/FTExtrudeGlyph.cpp b/src/FTGlyph/FTExtrudeGlyph.cpp
index 563d30d..5d6e4cc 100644
--- a/src/FTGlyph/FTExtrudeGlyph.cpp
+++ b/src/FTGlyph/FTExtrudeGlyph.cpp
@@ -41,16 +41,20 @@
 
 FTExtrudeGlyph::FTExtrudeGlyph(FT_GlyphSlot glyph, float depth,
                                float frontOutset, float backOutset,
-                               bool useDisplayList)
-{
-    impl = new FTExtrudeGlyphImpl(glyph, depth, frontOutset, backOutset,
-                                  useDisplayList);
-}
+                               bool useDisplayList) :
+    FTGlyph(new FTExtrudeGlyphImpl(glyph, depth, frontOutset, backOutset,
+                                   useDisplayList))
+{}
 
 
 FTExtrudeGlyph::~FTExtrudeGlyph()
+{}
+
+
+const FTPoint& FTExtrudeGlyph::Render(const FTPoint& pen, int renderMode)
 {
-    ;
+    FTExtrudeGlyphImpl *myimpl = dynamic_cast<FTExtrudeGlyphImpl *>(impl);
+    return myimpl->RenderImpl(pen, renderMode);
 }
 
 
@@ -126,7 +130,8 @@ FTExtrudeGlyphImpl::~FTExtrudeGlyphImpl()
 }
 
 
-const FTPoint& FTExtrudeGlyphImpl::Render(const FTPoint& pen, int renderMode)
+const FTPoint& FTExtrudeGlyphImpl::RenderImpl(const FTPoint& pen,
+                                              int renderMode)
 {
     glTranslatef(pen.X(), pen.Y(), 0);
     if(glList)
diff --git a/src/FTGlyph/FTExtrudeGlyphImpl.h b/src/FTGlyph/FTExtrudeGlyphImpl.h
index 22ea196..c604ade 100644
--- a/src/FTGlyph/FTExtrudeGlyphImpl.h
+++ b/src/FTGlyph/FTExtrudeGlyphImpl.h
@@ -40,7 +40,7 @@ class FTExtrudeGlyphImpl : public FTGlyphImpl
 
         virtual ~FTExtrudeGlyphImpl();
 
-        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
+        virtual const FTPoint& RenderImpl(const FTPoint& pen, int renderMode);
 
     private:
         /**
diff --git a/src/FTGlyph/FTGlyph.cpp b/src/FTGlyph/FTGlyph.cpp
index 3e5c4fc..8c3eab7 100644
--- a/src/FTGlyph/FTGlyph.cpp
+++ b/src/FTGlyph/FTGlyph.cpp
@@ -36,24 +36,21 @@
 //
 
 
-FTGlyph::FTGlyph()
+FTGlyph::FTGlyph(FT_GlyphSlot glyph)
 {
-    /* impl is set by the child class */
-    impl = NULL;
+    impl = new FTGlyphImpl(glyph);
 }
 
 
-FTGlyph::~FTGlyph()
+FTGlyph::FTGlyph(FTGlyphImpl *pImpl)
 {
-    /* Only the top class should be allowed to destroy impl, because
-     * we do not know how many levels of inheritance there are. */
-    delete impl;
+    impl = pImpl;
 }
 
 
-const FTPoint& FTGlyph::Render(const FTPoint& pen, int renderMode)
+FTGlyph::~FTGlyph()
 {
-    return impl->Render(pen, renderMode);
+    delete impl;
 }
 
 
diff --git a/src/FTGlyph/FTGlyphImpl.h b/src/FTGlyph/FTGlyphImpl.h
index 26b07fb..e25ad40 100644
--- a/src/FTGlyph/FTGlyphImpl.h
+++ b/src/FTGlyph/FTGlyphImpl.h
@@ -37,8 +37,6 @@ class FTGlyphImpl
 
         virtual ~FTGlyphImpl();
 
-        virtual const FTPoint& Render(const FTPoint& pen, int renderMode) = 0;
-
         const FTPoint& Advance() const;
 
         const FTBBox& BBox() const;
diff --git a/src/FTGlyph/FTOutlineGlyph.cpp b/src/FTGlyph/FTOutlineGlyph.cpp
index caf3167..5cd4704 100644
--- a/src/FTGlyph/FTOutlineGlyph.cpp
+++ b/src/FTGlyph/FTOutlineGlyph.cpp
@@ -39,15 +39,19 @@
 
 
 FTOutlineGlyph::FTOutlineGlyph(FT_GlyphSlot glyph, float outset,
-                               bool useDisplayList)
-{
-    impl = new FTOutlineGlyphImpl(glyph, outset, useDisplayList);
-}
+                               bool useDisplayList) :
+    FTGlyph(new FTOutlineGlyphImpl(glyph, outset, useDisplayList))
+{}
 
 
 FTOutlineGlyph::~FTOutlineGlyph()
+{}
+
+
+const FTPoint& FTOutlineGlyph::Render(const FTPoint& pen, int renderMode)
 {
-    ;
+    FTOutlineGlyphImpl *myimpl = dynamic_cast<FTOutlineGlyphImpl *>(impl);
+    return myimpl->RenderImpl(pen, renderMode);
 }
 
 
@@ -106,7 +110,8 @@ FTOutlineGlyphImpl::~FTOutlineGlyphImpl()
 }
 
 
-const FTPoint& FTOutlineGlyphImpl::Render(const FTPoint& pen, int renderMode)
+const FTPoint& FTOutlineGlyphImpl::RenderImpl(const FTPoint& pen,
+                                              int renderMode)
 {
     glTranslatef(pen.X(), pen.Y(), 0.0f);
     if(glList)
diff --git a/src/FTGlyph/FTOutlineGlyphImpl.h b/src/FTGlyph/FTOutlineGlyphImpl.h
index 54a62ba..eb1a769 100644
--- a/src/FTGlyph/FTOutlineGlyphImpl.h
+++ b/src/FTGlyph/FTOutlineGlyphImpl.h
@@ -40,7 +40,7 @@ class FTOutlineGlyphImpl : public FTGlyphImpl
 
         virtual ~FTOutlineGlyphImpl();
 
-        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
+        virtual const FTPoint& RenderImpl(const FTPoint& pen, int renderMode);
 
     private:
         /**
diff --git a/src/FTGlyph/FTPixmapGlyph.cpp b/src/FTGlyph/FTPixmapGlyph.cpp
index d4cfd73..a1b9fc1 100644
--- a/src/FTGlyph/FTPixmapGlyph.cpp
+++ b/src/FTGlyph/FTPixmapGlyph.cpp
@@ -38,15 +38,19 @@
 //
 
 
-FTPixmapGlyph::FTPixmapGlyph(FT_GlyphSlot glyph)
-{
-    impl = new FTPixmapGlyphImpl(glyph);
-}
+FTPixmapGlyph::FTPixmapGlyph(FT_GlyphSlot glyph) :
+    FTGlyph(new FTPixmapGlyphImpl(glyph))
+{}
 
 
 FTPixmapGlyph::~FTPixmapGlyph()
+{}
+
+
+const FTPoint& FTPixmapGlyph::Render(const FTPoint& pen, int renderMode)
 {
-    ;
+    FTPixmapGlyphImpl *myimpl = dynamic_cast<FTPixmapGlyphImpl *>(impl);
+    return myimpl->RenderImpl(pen, renderMode);
 }
 
 
@@ -110,7 +114,8 @@ FTPixmapGlyphImpl::~FTPixmapGlyphImpl()
 }
 
 
-const FTPoint& FTPixmapGlyphImpl::Render(const FTPoint& pen, int renderMode)
+const FTPoint& FTPixmapGlyphImpl::RenderImpl(const FTPoint& pen,
+                                             int renderMode)
 {
     if(data)
     {
diff --git a/src/FTGlyph/FTPixmapGlyphImpl.h b/src/FTGlyph/FTPixmapGlyphImpl.h
index 93751dd..f642eab 100644
--- a/src/FTGlyph/FTPixmapGlyphImpl.h
+++ b/src/FTGlyph/FTPixmapGlyphImpl.h
@@ -37,7 +37,7 @@ class FTPixmapGlyphImpl : public FTGlyphImpl
 
         virtual ~FTPixmapGlyphImpl();
 
-        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
+        virtual const FTPoint& RenderImpl(const FTPoint& pen, int renderMode);
 
     private:
         /**
diff --git a/src/FTGlyph/FTPolygonGlyph.cpp b/src/FTGlyph/FTPolygonGlyph.cpp
index ef32b4e..2f8b7b1 100644
--- a/src/FTGlyph/FTPolygonGlyph.cpp
+++ b/src/FTGlyph/FTPolygonGlyph.cpp
@@ -39,15 +39,19 @@
 
 
 FTPolygonGlyph::FTPolygonGlyph(FT_GlyphSlot glyph, float outset,
-                               bool useDisplayList)
-{
-    impl = new FTPolygonGlyphImpl(glyph, outset, useDisplayList);
-}
+                               bool useDisplayList) :
+    FTGlyph(new FTPolygonGlyphImpl(glyph, outset, useDisplayList))
+{}
 
 
 FTPolygonGlyph::~FTPolygonGlyph()
+{}
+
+
+const FTPoint& FTPolygonGlyph::Render(const FTPoint& pen, int renderMode)
 {
-    ;
+    FTPolygonGlyphImpl *myimpl = dynamic_cast<FTPolygonGlyphImpl *>(impl);
+    return myimpl->RenderImpl(pen, renderMode);
 }
 
 
@@ -109,7 +113,8 @@ FTPolygonGlyphImpl::~FTPolygonGlyphImpl()
 }
 
 
-const FTPoint& FTPolygonGlyphImpl::Render(const FTPoint& pen, int renderMode)
+const FTPoint& FTPolygonGlyphImpl::RenderImpl(const FTPoint& pen,
+                                              int renderMode)
 {
     glTranslatef(pen.X(), pen.Y(), 0.0f);
     if(glList)
diff --git a/src/FTGlyph/FTPolygonGlyphImpl.h b/src/FTGlyph/FTPolygonGlyphImpl.h
index d40f495..b598c1c 100644
--- a/src/FTGlyph/FTPolygonGlyphImpl.h
+++ b/src/FTGlyph/FTPolygonGlyphImpl.h
@@ -40,7 +40,7 @@ class FTPolygonGlyphImpl : public FTGlyphImpl
 
         virtual ~FTPolygonGlyphImpl();
 
-        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
+        virtual const FTPoint& RenderImpl(const FTPoint& pen, int renderMode);
 
     private:
         /**
diff --git a/src/FTGlyph/FTTextureGlyph.cpp b/src/FTGlyph/FTTextureGlyph.cpp
index b547d6d..b283aa2 100644
--- a/src/FTGlyph/FTTextureGlyph.cpp
+++ b/src/FTGlyph/FTTextureGlyph.cpp
@@ -39,15 +39,19 @@
 
 
 FTTextureGlyph::FTTextureGlyph(FT_GlyphSlot glyph, int id, int xOffset,
-                               int yOffset, int width, int height)
-{
-    impl = new FTTextureGlyphImpl(glyph, id, xOffset, yOffset, width, height);
-}
+                               int yOffset, int width, int height) :
+    FTGlyph(new FTTextureGlyphImpl(glyph, id, xOffset, yOffset, width, height))
+{}
 
 
 FTTextureGlyph::~FTTextureGlyph()
+{}
+
+
+const FTPoint& FTTextureGlyph::Render(const FTPoint& pen, int renderMode)
 {
-    ;
+    FTTextureGlyphImpl *myimpl = dynamic_cast<FTTextureGlyphImpl *>(impl);
+    return myimpl->RenderImpl(pen, renderMode);
 }
 
 
@@ -116,7 +120,8 @@ FTTextureGlyphImpl::~FTTextureGlyphImpl()
 {}
 
 
-const FTPoint& FTTextureGlyphImpl::Render(const FTPoint& pen, int renderMode)
+const FTPoint& FTTextureGlyphImpl::RenderImpl(const FTPoint& pen,
+                                              int renderMode)
 {
     float dx, dy;
 
diff --git a/src/FTGlyph/FTTextureGlyphImpl.h b/src/FTGlyph/FTTextureGlyphImpl.h
index b5b2f24..0a8323f 100644
--- a/src/FTGlyph/FTTextureGlyphImpl.h
+++ b/src/FTGlyph/FTTextureGlyphImpl.h
@@ -39,7 +39,7 @@ class FTTextureGlyphImpl : public FTGlyphImpl
 
         virtual ~FTTextureGlyphImpl();
 
-        virtual const FTPoint& Render(const FTPoint& pen, int renderMode);
+        virtual const FTPoint& RenderImpl(const FTPoint& pen, int renderMode);
 
     private:
         /**
diff --git a/src/FTLayout/FTLayout.cpp b/src/FTLayout/FTLayout.cpp
index 4f144a8..8a33fa4 100644
--- a/src/FTLayout/FTLayout.cpp
+++ b/src/FTLayout/FTLayout.cpp
@@ -38,54 +38,19 @@
 
 FTLayout::FTLayout()
 {
-    /* impl is set by the child class */
-    impl = NULL;
+    impl = new FTLayoutImpl();
 }
 
 
-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;
-}
-
-
-void FTLayout::BBox(const char* string, float& llx, float& lly,
-                    float& llz, float& urx, float& ury, float& urz)
-{
-    impl->BBox(string, llx, lly, llz, urx, ury, urz);
-}
-
-
-void FTLayout::BBox(const wchar_t* string, float& llx, float& lly,
-                    float& llz, float& urx, float& ury, float& urz)
-{
-    impl->BBox(string, llx, lly, llz, urx, ury, urz);
-}
-
-
-void FTLayout::Render(const char *string)
-{
-    impl->Render(string);
-}
-
-
-void FTLayout::Render(const char *string, int renderMode)
+FTLayout::FTLayout(FTLayoutImpl *pImpl)
 {
-    impl->Render(string, renderMode);
+    impl = pImpl;
 }
 
 
-void FTLayout::Render(const wchar_t *string)
-{
-    impl->Render(string);
-}
-
-
-void FTLayout::Render(const wchar_t *string, int renderMode)
+FTLayout::~FTLayout()
 {
-    impl->Render(string, renderMode);
+    delete impl;
 }
 
 
diff --git a/src/FTLayout/FTLayoutImpl.h b/src/FTLayout/FTLayoutImpl.h
index 6d739d7..4bc0aa6 100644
--- a/src/FTLayout/FTLayoutImpl.h
+++ b/src/FTLayout/FTLayoutImpl.h
@@ -39,64 +39,6 @@ class FTLayoutImpl
 
         virtual ~FTLayoutImpl();
 
-        /**
-         * Get the bounding box for a formatted string.
-         *
-         * @param string    a char string
-         * @param llx       lower left near x coord
-         * @param lly       lower left near y coord
-         * @param llz       lower left near z coord
-         * @param urx       upper right far x coord
-         * @param ury       upper right far y coord
-         * @param urz       upper right far z coord
-         */
-        virtual void BBox(const char* string, float& llx, float& lly,
-                          float& llz, float& urx, float& ury, float& urz) = 0;
-
-        /**
-         * Get the bounding box for a formatted string.
-         *
-         * @param string    a wchar_t string
-         * @param llx       lower left near x coord
-         * @param lly       lower left near y coord
-         * @param llz       lower left near z coord
-         * @param urx       upper right far x coord
-         * @param ury       upper right far y coord
-         * @param urz       upper right far z coord
-         */
-        virtual void BBox(const wchar_t* string, float& llx, float& lly,
-                          float& llz, float& urx, float& ury, float& urz) = 0;
-
-        /**
-         * Render a string of characters
-         *
-         * @param string    'C' style string to be output.
-         */
-        virtual void Render(const char *string) = 0;
-
-        /**
-         * Render a string of characters
-         *
-         * @param string    'C' style string to be output.
-         * @param renderMode  Render mode to diplay
-         */
-        virtual void Render(const char *string, int renderMode) = 0;
-
-        /**
-         * Render a string of characters
-         *
-         * @param string    wchar_t string to be output.
-         */
-        virtual void Render(const wchar_t *string) = 0;
-
-        /**
-         * Render a string of characters
-         *
-         * @param string    wchar_t string to be output.
-         * @param renderMode  Render mode to diplay
-         */
-        virtual void Render(const wchar_t *string, int renderMode) = 0;
-
     protected:
         /**
          * Current pen or cursor position;
diff --git a/src/FTLayout/FTSimpleLayout.cpp b/src/FTLayout/FTSimpleLayout.cpp
index ea8529b..76ae367 100644
--- a/src/FTLayout/FTSimpleLayout.cpp
+++ b/src/FTLayout/FTSimpleLayout.cpp
@@ -38,9 +38,52 @@
 //
 
 
-FTSimpleLayout::FTSimpleLayout()
+FTSimpleLayout::FTSimpleLayout() :
+    FTLayout(new FTSimpleLayoutImpl())
+{}
+
+
+FTSimpleLayout::~FTSimpleLayout()
+{}
+
+
+void FTSimpleLayout::BBox(const char *string, float& llx, float& lly,
+                              float& llz, float& urx, float& ury, float& urz)
+{
+    dynamic_cast<FTSimpleLayoutImpl*>(impl)->BBox(string, llx, lly, llz,
+                                                  urx, ury, urz);
+}
+
+
+void FTSimpleLayout::BBox(const wchar_t *string, float& llx, float& lly,
+                              float& llz, float& urx, float& ury, float& urz)
+{
+    dynamic_cast<FTSimpleLayoutImpl*>(impl)->BBox(string, llx, lly, llz,
+                                                  urx, ury, urz);
+}
+
+
+void FTSimpleLayout::Render(const char *string)
+{
+    dynamic_cast<FTSimpleLayoutImpl*>(impl)->Render(string);
+}
+
+
+void FTSimpleLayout::Render(const wchar_t* string)
+{
+    dynamic_cast<FTSimpleLayoutImpl*>(impl)->Render(string);
+}
+
+
+void FTSimpleLayout::Render(const char *string, int renderMode)
+{
+    dynamic_cast<FTSimpleLayoutImpl*>(impl)->Render(string, renderMode);
+}
+
+
+void FTSimpleLayout::Render(const wchar_t* string, int renderMode)
 {
-    impl = new FTSimpleLayoutImpl();
+    dynamic_cast<FTSimpleLayoutImpl*>(impl)->Render(string, renderMode);
 }