From: Ove Kaaven <ovek@arcticnet.no>
Date: Thu, 28 Oct 1999 10:31:16 +0000 (+0000)
Subject: Use wxConvertMB2WX to fix compilation error in Unicode build
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f6e9f05fa7b0d0cafd9e8f425db7eb1c118bc441

Use wxConvertMB2WX to fix compilation error in Unicode build


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 6ad12197a5..42e9ff74d4 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -586,12 +586,8 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
   }
   else
   {
-    // FIXME it was
-    // return (wxMB2WXbuf)(wxConvCurrent->cMB2WX(pszTrans));
-    //       before, but we don't want to use wxConvCurrent explicitly to
-    //       avoid linking unnecessary code in ANSI programs without MB
-    //       support
-    return (wxMB2WXbuf)(pszTrans);
+    return wxConvertMB2WX(pszTrans); // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something,
+                                     // a macro similar to wxConvertMB2WX could be written for that
   }
 
   #undef szOrgString