Fixed player dialog listbox size and app icon on wxGTK

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

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 07db51f0ab8e4d8cc8468a2f0febc2c856aa3c67..fc503f190f49488c7fc36192871bba2a9821b375 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
 #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
     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;
     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;
     if (m_renderTable)
         XmRenderTableFree ((XmRenderTable) m_renderTable);
     m_renderTable = NULL;


@@ -679,7 +679,8 @@ void wxGetTextExtent(WXDisplay* display, const wxFont& font,
     XCharStruct overall;
     int slen = str.length();
 
     XCharStruct overall;
     int slen = str.length();
 

-    XTextExtents((XFontStruct*) pFontStruct, (char*) str.mb_str(), slen,
+    XTextExtents((XFontStruct*) pFontStruct,
+                 wx_const_cast(char*, (const char *)str.mb_str()), slen,

                  &direction, &ascent2, &descent2, &overall);
 
     if ( width )
                  &direction, &ascent2, &descent2, &overall);
 
     if ( width )