Applied initial patches for wx2.8 compatibility

[ctsim.git] / libctgraphics / sgp.cpp

diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp
index 305a6300f4aed6cb72b5430979910b630bc8d6b3..9757fe9fb03449e911e7d0fcee351488be47540a 100644 (file)
--- a/libctgraphics/sgp.cpp
+++ b/libctgraphics/sgp.cpp
@@ -570,9 +570,8 @@ 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);
+    m_driver.idWX()->GetTextExtent (wxConvCurrent->cMB2WC(szText), &deviceW, &deviceH);
     if (m_dTextAngle == 90 || m_dTextAngle == -90) {
       wxCoord temp = deviceW;
       deviceW = deviceH;
@@ -722,8 +721,7 @@ SGP::drawText (const char *pszMessage)
 #endif
 #if HAVE_WXWINDOWS
   if (m_driver.isWX()) {
-    wxString str (pszMessage);
-    m_driver.idWX()->DrawRotatedText (str, m_iCurrentPhysicalX, m_iCurrentPhysicalY, m_dTextAngle);
+    m_driver.idWX()->DrawRotatedText (wxConvCurrent->cMB2WC(pszMessage), m_iCurrentPhysicalX, m_iCurrentPhysicalY, m_dTextAngle);
   }
 #endif
 }