X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctgraphics%2Fsgp.cpp;h=6d0e1f4838daa28d34894ecd2c76a0ddafc15cd8;hb=bb09705ec0a20bf5b41b4248cf7800b000bc3fcb;hp=305a6300f4aed6cb72b5430979910b630bc8d6b3;hpb=1a050c98763fbbc0662731b0b76953acede6f5d7;p=ctsim.git diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp index 305a630..6d0e1f4 100644 --- a/libctgraphics/sgp.cpp +++ b/libctgraphics/sgp.cpp @@ -570,9 +570,9 @@ SGP::getTextExtent (const char* szText, double* worldW, double* worldH) { #if HAVE_WXWINDOWS if (m_driver.isWX()) { - wxString sText (szText); wxCoord deviceW, deviceH; - m_driver.idWX()->GetTextExtent (sText, &deviceW, &deviceH); + wxString str (wxConvCurrent->cMB2WC(szText)); + m_driver.idWX()->GetTextExtent (str, &deviceW, &deviceH); if (m_dTextAngle == 90 || m_dTextAngle == -90) { wxCoord temp = deviceW; deviceW = deviceH; @@ -722,7 +722,7 @@ SGP::drawText (const char *pszMessage) #endif #if HAVE_WXWINDOWS if (m_driver.isWX()) { - wxString str (pszMessage); + wxString str(wxConvCurrent->cMB2WC(pszMessage)); m_driver.idWX()->DrawRotatedText (str, m_iCurrentPhysicalX, m_iCurrentPhysicalY, m_dTextAngle); } #endif