From 4227afa4f748870bbfce75047db465f024e0ac1d Mon Sep 17 00:00:00 2001 From: Stefan Csomor <csomor@advancedconcepts.ch> Date: Sun, 7 Mar 2004 14:54:21 +0000 Subject: [PATCH] byte length for interim UniChar String corrected git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/strconv.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 487b2204aa..8597373f54 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -71,9 +71,9 @@ #include "wx/fontmap.h" #ifdef __WXMAC__ -#include "ATSUnicode.h" -#include "TextCommon.h" -#include "TextEncodingConverter.h" +#include <ATSUnicode.h> +#include <TextCommon.h> +#include <TextEncodingConverter.h> #include "wx/mac/private.h" // includes mac headers #endif @@ -1373,9 +1373,9 @@ public: #if SIZEOF_WCHAR_T == 4 wxMBConvUTF16BE converter ; size_t unicharlen = converter.WC2MB( NULL , psz , 0 ) ; - byteBufferLen = unicharlen ; - ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ; - converter.WC2MB( (char*) ubuf , psz, unicharlen ) ; + byteInLen = unicharlen ; + ubuf = (UniChar*) malloc( byteInLen + 2 ) ; + converter.WC2MB( (char*) ubuf , psz, unicharlen + 2 ) ; #else ubuf = (UniChar*) psz ; #endif -- 2.47.2