projects
/
ctsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
06fd44b
)
fix wxString compilation problem with non-unicode build
author
Kevin Rosenberg
<kevin@rosenberg.net>
Sat, 1 Aug 2009 23:00:03 +0000
(17:00 -0600)
committer
Kevin Rosenberg
<kevin@rosenberg.net>
Sat, 1 Aug 2009 23:00:03 +0000
(17:00 -0600)
libctgraphics/sgp.cpp
patch
|
blob
|
history
diff --git
a/libctgraphics/sgp.cpp
b/libctgraphics/sgp.cpp
index 9757fe9fb03449e911e7d0fcee351488be47540a..6d0e1f4838daa28d34894ecd2c76a0ddafc15cd8 100644
(file)
--- a/
libctgraphics/sgp.cpp
+++ b/
libctgraphics/sgp.cpp
@@
-571,7
+571,8
@@
SGP::getTextExtent (const char* szText, double* worldW, double* worldH)
#if HAVE_WXWINDOWS
if (m_driver.isWX()) {
wxCoord deviceW, deviceH;
#if HAVE_WXWINDOWS
if (m_driver.isWX()) {
wxCoord deviceW, deviceH;
- m_driver.idWX()->GetTextExtent (wxConvCurrent->cMB2WC(szText), &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;
if (m_dTextAngle == 90 || m_dTextAngle == -90) {
wxCoord temp = deviceW;
deviceW = deviceH;
@@
-721,7
+722,8
@@
SGP::drawText (const char *pszMessage)
#endif
#if HAVE_WXWINDOWS
if (m_driver.isWX()) {
#endif
#if HAVE_WXWINDOWS
if (m_driver.isWX()) {
- m_driver.idWX()->DrawRotatedText (wxConvCurrent->cMB2WC(pszMessage), m_iCurrentPhysicalX, m_iCurrentPhysicalY, m_dTextAngle);
+ wxString str(wxConvCurrent->cMB2WC(pszMessage));
+ m_driver.idWX()->DrawRotatedText (str, m_iCurrentPhysicalX, m_iCurrentPhysicalY, m_dTextAngle);
}
#endif
}
}
#endif
}