compilation fix for systems with XtIMSignal

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index d06990d497bb997723e5f2269277e6fee536ab80..13133ceeac0062366d5306fc326dffeec9bc1525 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -155,8 +155,11 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
     // Motif version of the libs but the X protocol
     // version!
     Display *display = wxGlobalDisplay();
-    info.versionMajor = ProtocolVersion (display);
-    info.versionMinor = ProtocolRevision (display);
+    if (display)
+    {
+        info.versionMajor = ProtocolVersion (display);
+        info.versionMinor = ProtocolRevision (display);
+    }
     info.os = wxMOTIF_X;
     return info;
 }
@@ -929,7 +932,7 @@ extern void wxDoChangeFont(WXWidget widget, wxFont& font)
 #if !wxCHECK_LESSTIF() || wxCHECK_LESSTIF_VERSION( 0, 93 )
     Widget w = (Widget)widget;
     XtVaSetValues( w,
-                   wxFont::GetFontTag(), font.GetFontType( XtDisplay(w) ),
+                   wxFont::GetFontTag(), font.GetFontTypeC( XtDisplay(w) ),
                    NULL );
 #endif