Fix handling of the *.* extension case, before this fix it was being passed as a...

[wxWidgets.git] / src / osx / core / cfstring.cpp

diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp
index 46a9c0c8af28b9cf976a3ea33d091aa37d64aa3c..96bc244d381ca567aef84654fc46312a36f766aa 100644 (file)
--- a/src/osx/core/cfstring.cpp
+++ b/src/osx/core/cfstring.cpp
@@ -186,8 +186,8 @@ wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
 #if 0
     case wxFONTENCODING_UTF7 :
         enc = CreateTextEncoding(kCFStringEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
 #if 0
     case wxFONTENCODING_UTF7 :
         enc = CreateTextEncoding(kCFStringEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;

-#endif

         break ;
         break ;

+#endif

     case wxFONTENCODING_UTF8 :
         enc = kCFStringEncodingUTF8;
         break ;
     case wxFONTENCODING_UTF8 :
         enc = kCFStringEncodingUTF8;
         break ;


@@ -638,9 +638,8 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
         return wxEmptyString ;
 
     Size cflen = CFStringGetLength( ref )  ;
         return wxEmptyString ;
 
     Size cflen = CFStringGetLength( ref )  ;

-    char* buf = NULL ;

 
 

-    CFStringEncoding cfencoding = 0;
+    CFStringEncoding cfencoding;

     wxString result;
 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR
     wxString result;
 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR


@@ -657,7 +656,7 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
     CFIndex cStrLen ;
     CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding ,
         '?' , false , NULL , 0 , &cStrLen ) ;
     CFIndex cStrLen ;
     CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding ,
         '?' , false , NULL , 0 , &cStrLen ) ;

-    buf = new char[ cStrLen ] ;
+    char* buf = new char[cStrLen];

     CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding,
         '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;
 
     CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding,
         '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;