Commit b70df3d7cd66b17e4ecdcb27f0ca26c3e88a6c37
2008-05-11T21:43:35
* Get rid of FTSimpleLayout::RenderSpace(). It's still useful in FTSimpleLayoutImpl, but as a public method FTFont::Render() is just as powerful.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90
diff --git a/src/FTGL/FTSimpleLayout.h b/src/FTGL/FTSimpleLayout.h
index c504ad3..c778b18 100644
--- a/src/FTGL/FTSimpleLayout.h
+++ b/src/FTGL/FTSimpleLayout.h
@@ -165,32 +165,6 @@ class FTGL_EXPORT FTSimpleLayout : public FTLayout
* @return The line spacing.
*/
float GetLineSpacing() const;
-
- /**
- * Render a string of characters and distribute extra space amongst
- * the whitespace regions of the string.
- *
- * @param string 'C' style string to output.
- * @param ExtraSpace The amount of extra space to add to each run of
- * whitespace.
- */
- void RenderSpace(const char *string, const int len = -1,
- FTPoint position = FTPoint(),
- int renderMode = FTGL::RENDER_ALL,
- const float ExtraSpace = 0.0);
-
- /**
- * Render a string of characters and distribute extra space amongst
- * the whitespace regions of the string.
- *
- * @param string wchar_t string to output.
- * @param ExtraSpace The amount of extra space to add to each run of
- * whitespace.
- */
- void RenderSpace(const wchar_t *string, const int len = -1,
- FTPoint position = FTPoint(),
- int renderMode = FTGL::RENDER_ALL,
- const float ExtraSpace = 0.0);
};
#endif //__cplusplus
@@ -199,8 +173,6 @@ FTGL_BEGIN_C_DECLS
FTGL_EXPORT FTGLlayout *ftglCreateSimpleLayout(void);
-FTGL_EXPORT void ftglRenderLayoutSpace(FTGLlayout *, const char *, float);
-
FTGL_EXPORT void ftglSetLayoutFont(FTGLlayout *, FTGLfont*);
FTGL_EXPORT FTGLfont *ftglGetLayoutFont(FTGLlayout *);
diff --git a/src/FTLayout/FTLayoutGlue.cpp b/src/FTLayout/FTLayoutGlue.cpp
index e37d11e..7cbdde4 100644
--- a/src/FTLayout/FTLayoutGlue.cpp
+++ b/src/FTLayout/FTLayoutGlue.cpp
@@ -106,10 +106,6 @@ void ftgGetlLayoutBBox(FTGLlayout *l, const char * s, float c[6])
C_FUN(void, ftglRenderLayout, (FTGLlayout *l, const char *s, int r),
return, Render, (s, r));
-// void FTSimpleLayout::RenderSpace(const char *string, const float ExtraSpace = 0.0)
-C_FUN(void, ftglRenderLayoutSpace, (FTGLlayout *l, const char *s, float e),
- return, RenderSpace, (s, e));
-
// void SetFont(FTFont *fontInit)
void ftglSetLayoutFont(FTGLlayout *l, FTGLfont *font)
{
diff --git a/src/FTLayout/FTSimpleLayout.cpp b/src/FTLayout/FTSimpleLayout.cpp
index 0aac2f8..1823250 100644
--- a/src/FTLayout/FTSimpleLayout.cpp
+++ b/src/FTLayout/FTSimpleLayout.cpp
@@ -123,24 +123,6 @@ float FTSimpleLayout::GetLineSpacing() const
}
-void FTSimpleLayout::RenderSpace(const char *string, const int len,
- FTPoint position, int renderMode,
- const float extraSpace)
-{
- FTSimpleLayoutImpl *pImpl = dynamic_cast<FTSimpleLayoutImpl*>(impl);
- return pImpl->RenderSpace(string, len, position, renderMode, extraSpace);
-}
-
-
-void FTSimpleLayout::RenderSpace(const wchar_t *string, const int len,
- FTPoint position, int renderMode,
- const float extraSpace)
-{
- FTSimpleLayoutImpl *pImpl = dynamic_cast<FTSimpleLayoutImpl*>(impl);
- return pImpl->RenderSpace(string, len, position, renderMode, extraSpace);
-}
-
-
//
// FTSimpleLayoutImpl
//