Settings tab: don't autoscroll when toggling "Show technical names"

[dragonfireclient.git] / src / fontengine.h

diff --git a/src/fontengine.h b/src/fontengine.h
index 6a53397707a7cace65c7cd022201c68e8698070b..9f7266775ac944e515f77ee9bd12704966c3ba16 100644 (file)
--- a/src/fontengine.h
+++ b/src/fontengine.h
@@ -59,7 +59,7 @@ class FontEngine
                        unsigned int font_size=FONT_SIZE_UNSPECIFIED,
                        FontMode mode=FM_Unspecified)
        {
-               return getTextWidth(narrow_to_wide(text));
+               return getTextWidth(utf8_to_wide(text));
        }
 
        /** get text width if a text for a specific font */
@@ -86,7 +86,6 @@ class FontEngine
                m_settings(NULL),
                m_env(NULL),
                m_font_cache(),
-               m_default_size(),
                m_currentMode(FM_Standard),
                m_lastMode(),
                m_lastSize(0),
@@ -135,6 +134,6 @@ class FontEngine
 };
 
 /** interface to access main font engine*/
-extern FontEngine* glb_fontengine;
+extern FontEngine* g_fontengine;
 
 #endif