non-unicode fix

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index ab012ec1039fbfadd084bb653b8a3babe9b21197..ebdbc7082f642b789df1f4e693cd3a9187b0e67f 100644 (file)
--- 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 ) ,
 #else
     CFIndex cStrLen ;
     CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,

-        '?' , false , NULL , 0 , cStrLen ) ;
+        '?' , false , NULL , 0 , &cStrLen ) ;

     buf = new wxChar[ cStrLen + 1 ] ; 
     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
 
     noChars = cStrLen ;
 #endif
 

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index ab012ec1039fbfadd084bb653b8a3babe9b21197..ebdbc7082f642b789df1f4e693cd3a9187b0e67f 100644 (file)
--- 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 ) ,
 #else
     CFIndex cStrLen ;
     CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,

-        '?' , false , NULL , 0 , cStrLen ) ;
+        '?' , false , NULL , 0 , &cStrLen ) ;

     buf = new wxChar[ cStrLen + 1 ] ; 
     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
 
     noChars = cStrLen ;
 #endif