Fixed caret sizing bug

[wxWidgets.git] / src / motif / font.cpp

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 42e6e1e70f10ac2343a33644725dc919b3c214c7..d378180775f9def1b03973227e678c597a2372dc 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -61,7 +61,7 @@ public:
 #endif
 #if !wxMOTIF_USE_RENDER_TABLE
     WXFontList          m_fontList;     // Motif XmFontList
-#else // if wxUSE_RENDER_TABLE
+#else // if wxMOTIF_USE_RENDER_TABLE
     WXRenderTable       m_renderTable;  // Motif XmRenderTable
     WXRendition         m_rendition;    // Motif XmRendition
 #endif
@@ -147,7 +147,7 @@ wxXFont::~wxXFont()
     if (m_fontList)
         XmFontListFree ((XmFontList) m_fontList);
     m_fontList = NULL;
-#else // if wxUSE_RENDER_TABLE
+#else // if wxMOTIF_USE_RENDER_TABLE
     if (m_renderTable)
         XmRenderTableFree ((XmRenderTable) m_renderTable);
     m_renderTable = NULL;
@@ -550,7 +550,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     int count = 0;
 
 #if wxMOTIF_NEW_FONT_HANDLING
-    wxChar* fontSpec = wxStrdup( xFontSpec.mb_str() );
+    char* fontSpec = wxStrdup(xFontSpec.mb_str());
     XtSetArg( args[count], XmNfontName, fontSpec ); ++count;
     XtSetArg( args[count], XmNfontType, XmFONT_IS_FONTSET ); ++count;
 #else