From 124193837f27d1fb75b9607f0e005b9897d1e320 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 3 Oct 2001 23:34:25 +0000 Subject: [PATCH] warning in Unicode compilation fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/intl.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 12beb715c7..08797387a7 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -1377,12 +1377,13 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString, return (wxMB2WXbuf)(szOrigString); } - else - { - return wxConvertMB2WX(pszTrans); // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something, - // a macro similar to wxConvertMB2WX could be written for that - } + // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something, a macro + // similar to wxConvertMB2WX could be written for that + + return wxConvertMB2WX(pszTrans); + + // undo the hack from the beginning of this function #undef szOrgString } -- 2.45.2