X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79e4b6277eec63c346239e8957fed478f5daa6ab..b3402d0df8c9f763da1e32fc28c824014e5516c6:/src/motif/font.cpp diff --git a/src/motif/font.cpp b/src/motif/font.cpp index 10ab6faf5b..e112ff2d26 100644 --- a/src/motif/font.cpp +++ b/src/motif/font.cpp @@ -21,7 +21,13 @@ #pragma implementation "font.h" #endif +#ifdef __VMS +#pragma message disable nosimpint +#endif #include +#ifdef __VMS +#pragma message enable nosimpint +#endif #include "wx/defs.h" #include "wx/string.h" @@ -30,9 +36,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 +364,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,