X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39b61aa3eb950489f880fbe2024d3b5bc82a11f5..b39fc8d7b1b853cb15f39d51617214b7b90a8872:/src/motif/dcclient.cpp

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 8620c5ef70..1a3ec55e8d 100644
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -1126,11 +1126,11 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 #if wxMOTIF_NEW_FONT_HANDLING
             XmbDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), fset, (GC) m_gcBacking,
             XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent,
-                        wxConstCast(text.c_str(), char), slen);
+                        wxConstCast(text.mb_str(), char), slen);
 #else
             XDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
             XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent,
-                        wxConstCast(text.c_str(), char), slen);
+                        wxConstCast(text.mb_str(), char), slen);
 #endif
     }
 
@@ -2219,7 +2219,7 @@ install:
         XPutImage(dest_display, dest, destgc, destimage, 0, 0, destx, desty, w, h);
         XDestroyImage(destimage);
 
-        if (more)
+        if (more && cache)
             *cache = image;
         else
             XDestroyImage(image);