IMHO, putting #if defined(__VISAGECPP__) (is it Visual Age?) around the
two known trouble lines in here was a stupid idea (the work of someone who didn't pay attention to wx-dev discussions?)... now that wxEncodingConverter is fixed, I took them away... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -321,11 +321,7 @@ size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
|
||||
((wxCSConv *)this)->LoadNow(); // discard constness
|
||||
if (buf) {
|
||||
if (m_cset) {
|
||||
#if defined(__VISAGECPP__)
|
||||
m_cset->m2w.Convert(psz, (wxChar*)buf);
|
||||
#else
|
||||
m_cset->m2w.Convert(psz, buf);
|
||||
#endif
|
||||
} else {
|
||||
// latin-1 (direct)
|
||||
for (size_t c=0; c<n; c++)
|
||||
@@ -341,11 +337,7 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
|
||||
((wxCSConv *)this)->LoadNow(); // discard constness
|
||||
if (buf) {
|
||||
if (m_cset) {
|
||||
#if defined(__VISAGECPP__)
|
||||
m_cset->w2m.Convert((wxChar*)psz, buf);
|
||||
#else
|
||||
m_cset->w2m.Convert(psz, buf);
|
||||
#endif
|
||||
} else {
|
||||
// latin-1 (direct)
|
||||
for (size_t c=0; c<n; c++)
|
||||
|
Reference in New Issue
Block a user