Font (possible) fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index 8f16fa74e3660603191c0aa8fa79377b0371834b..0278302b5f56ab272a256c53402bee029a751ecb 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -1565,7 +1565,9 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 
     XSetFont( (Display*) m_display, (GC) m_textGC, xfont->fid );
 #if !wxUSE_NANOX
 
     XSetFont( (Display*) m_display, (GC) m_textGC, xfont->fid );
 #if !wxUSE_NANOX

-    if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0))
+    // This may be a test for whether the font is 16-bit, but it also
+    // seems to fail for valid 8-bit fonts too.
+    if (1) // (xfont->min_byte1 == 0) && (xfont->max_byte1 == 0))

 #endif
     {
         XDrawString( (Display*) m_display, (Window) m_window,
 #endif
     {
         XDrawString( (Display*) m_display, (Window) m_window,