Updated version to 2.3.2 so apps can test for differences in new merged source
[wxWidgets.git] / src / unix / fontenum.cpp
index a1d374896eee08ef33c08ab9ca2fa7124d2c5d7e..5cd8a2698110f80b618ec33630dc228f9664605f 100644 (file)
 #include "wx/fontenum.h"
 #include "wx/fontutil.h"
 
+#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
+               // The resulting warnings are switched off here
+#pragma message disable nosimpint
+#endif
 #include <X11/Xlib.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 // ----------------------------------------------------------------------------
 // private functions
@@ -66,11 +73,13 @@ static char **CreateFontList(wxChar spacing,
     wxNativeEncodingInfo info;
     wxGetNativeFontEncoding(encoding, &info);
 
+#if wxUSE_FONTMAP
     if ( !wxTestFontEncoding(info) )
     {
         // ask font mapper for a replacement
         (void)wxTheFontMapper->GetAltForEncoding(encoding, &info);
     }
+#endif // wxUSE_FONTMAP
 
     wxString pattern;
     pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"),