#5436: Use FTGL namespace when accessing the FT API

codereader · Nov 30, 2020 · 58e5d87 · 58e5d87
1 parent d7806be
commit 58e5d87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libs/wxutil/GLFont.cpp b/libs/wxutil/GLFont.cpp
@@ -10,7 +10,7 @@ namespace wxutil
 
 GLFont::GLFont(Style style, unsigned int size) :
 	_pixelHeight(0),
-	_ftglFont(NULL)
+	_ftglFont(nullptr)
 {
     // Load the locally-provided TTF font file
 	std::string fontpath = module::GlobalModuleRegistry()
@@ -24,7 +24,7 @@ GLFont::GLFont(Style style, unsigned int size) :
 
 	if (_ftglFont)
 	{
-		ftglSetFontFaceSize(_ftglFont,size,0);
+        FTGL::ftglSetFontFaceSize(_ftglFont, size, 0);
 		_pixelHeight = static_cast<int>(FTGL::ftglGetFontLineHeight(_ftglFont));
 	}
 	else
@@ -38,7 +38,7 @@ GLFont::~GLFont()
 	if (_ftglFont)
 	{
 		FTGL::ftglDestroyFont(_ftglFont);
-		_ftglFont = NULL;
+		_ftglFont = nullptr;
 	}
 }
 

diff --git a/radiant/render/OpenGLModule.cpp b/radiant/render/OpenGLModule.cpp
@@ -44,7 +44,7 @@ void OpenGLModule::drawString(const std::string& string) const
 {
     if (_font)
     {
-        ftglRenderFont(_font->getFtglFont(), string.c_str(), 0xFFFF);//FTGL_RENDER_ALL);
+        FTGL::ftglRenderFont(_font->getFtglFont(), string.c_str(), FTGL::RENDER_ALL);
     }
 }