X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/motif/font.cpp?ds=sidebyside

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 817ca89938..048592aeb0 100644
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -21,13 +21,14 @@
     #pragma implementation "font.h"
 #endif
 
+#include <Xm/Xm.h>
+
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
-#include "wx/utils.h"
-
-#include <Xm/Xm.h>
+#include "wx/utils.h"       // for wxGetDisplay()
+#include "wx/fontutil.h"
 
 #if !USE_SHARED_LIBRARIES
     IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
@@ -39,7 +40,7 @@
 
 // For every wxFont, there must be a font for each display and scale requested.
 // So these objects are stored in wxFontRefData::m_fonts
-class wxXFont: public wxObject
+class wxXFont : public wxObject
 {
 public:
     wxXFont();
@@ -359,17 +360,18 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     }
 
     // not found, create a new one
-    XFontStruct *font = wxLoadQueryNearestFont(pointSize,
+    XFontStruct *font = (XFontStruct *)
+                        wxLoadQueryNearestFont(pointSize,
                                                M_FONTDATA->m_family,
                                                M_FONTDATA->m_style,
                                                M_FONTDATA->m_weight,
                                                M_FONTDATA->m_underlined,
-                                               T(""),
+                                               wxT(""),
                                                M_FONTDATA->m_encoding);
 
     if ( !font )
     {
-        wxFAIL_MSG( T("Could not allocate even a default font -- something is wrong.") );
+        wxFAIL_MSG( wxT("Could not allocate even a default font -- something is wrong.") );
 
         return (wxXFont*) NULL;
     }