From 595f4bc27a25d8594e33129e07a4bf2c60137c60 Mon Sep 17 00:00:00 2001 From: Ove Kaaven Date: Tue, 28 Mar 2000 00:39:51 +0000 Subject: [PATCH] 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 --- src/common/strconv.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 41b84f06f1..03b1504dfd 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -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; cLoadNow(); // 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