From ac86379e2ac8695a08fc65cee6e2475f9a6615c2 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 11 Feb 2004 15:19:23 +0000 Subject: [PATCH] non-unicode fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/utils.cpp | 6 +++--- src/mac/utils.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index ab012ec103..ebdbc7082f 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -1152,10 +1152,10 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding) #else CFIndex cStrLen ; CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) , - '?' , false , NULL , 0 , cStrLen ) ; + '?' , false , NULL , 0 , &cStrLen ) ; buf = new wxChar[ cStrLen + 1 ] ; - CFStringGetBytes( m_cfs , CFRangeMake(0, len) , wxMacGetSystemEncFromFontEnc( encoding ) , - '?' , false , (void*) buf , cStrLen , &StrLen) ; + CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) , + '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ; noChars = cStrLen ; #endif diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp index ab012ec103..ebdbc7082f 100644 --- a/src/mac/utils.cpp +++ b/src/mac/utils.cpp @@ -1152,10 +1152,10 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding) #else CFIndex cStrLen ; CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) , - '?' , false , NULL , 0 , cStrLen ) ; + '?' , false , NULL , 0 , &cStrLen ) ; buf = new wxChar[ cStrLen + 1 ] ; - CFStringGetBytes( m_cfs , CFRangeMake(0, len) , wxMacGetSystemEncFromFontEnc( encoding ) , - '?' , false , (void*) buf , cStrLen , &StrLen) ; + CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) , + '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ; noChars = cStrLen ; #endif -- 2.45.2