added bitmaps to menu items

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

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 10ab6faf5bd090cad51e3be9991d855ff8a3a285..9ce3b3cce0f0b5f3cbbe3c710d02f3c042e5c5e6 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -21,7 +21,14 @@
     #pragma implementation "font.h"
 #endif
 
+#ifdef __VMS
+#pragma message disable nosimpint
+#include "wx/vms_x_fix.h"
+#endif
 #include <Xm/Xm.h>
+#ifdef __VMS
+#pragma message enable nosimpint
+#endif
 
 #include "wx/defs.h"
 #include "wx/string.h"
@@ -30,9 +37,7 @@
 #include "wx/utils.h"       // for wxGetDisplay()
 #include "wx/fontutil.h"
 
-#if !USE_SHARED_LIBRARIES
     IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-#endif
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -360,7 +365,8 @@ 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,