Added new __WXMOTIF20__ macro, which is true if the Motif version

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 78989f932c35c0b4d426f13a1fb3f663451018ec..4048d5a723fcf3f0ee8f8277e3f4354224f86c1a 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -1249,14 +1249,11 @@ void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, boo
 
 extern void wxDoChangeFont(WXWidget widget, wxFont& font)
 {
-    // lesstif 0.87 hangs here, but 0.93 does not
-#if !defined(LESSTIF_VERSION) \
-    || (defined(LesstifVersion) && LesstifVersion >= 93)
-
+    // Lesstif 0.87 hangs here, but 0.93 does not
+#if !wxCHECK_LESSTIF() || wxCHECK_LESSTIF_VERSION( 0, 93 )
     Widget w = (Widget)widget;
-    XmFontList fontList = (XmFontList)font.GetFontList(1.0, XtDisplay(w));
     XtVaSetValues( w,
-                   XmNfontList, fontList,
+                   wxFont::GetFontTag(), font.GetFontType( XtDisplay(w) ),
                    NULL );
 #endif