add default value for the encoding parameter of wxMacCFStringHolder() instead of passing wxLocale::GetSystemEncoding() which doesn't work when wxUSE_INTL == 0 to it in many places (replaces 2nd part of patch 1501724)

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

include/wx/mac/corefoundation/cfstring.h

@@ -44,7 +44,8 @@ public:
     {
     }
 
-    wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
+    wxMacCFStringHolder(const wxString &str,
+                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
         : m_cfs(NULL) , m_release(false)
     {
         Assign( str , encoding ) ;
@@ -75,7 +76,8 @@ public:
         m_cfs = NULL ;
     }
 
-    void Assign( const wxString &str , wxFontEncoding encoding ) ;
+    void Assign(const wxString &str,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
     operator CFStringRef () const { return m_cfs; }
     wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;

src/common/filefn.cpp

@@ -884,13 +884,13 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
     CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
     CFRelease( cfString );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
-    return wxMacCFStringHolder(cfMutableString).AsString(wxLocale::GetSystemEncoding());
+    return wxMacCFStringHolder(cfMutableString).AsString();
 }
 
 OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
 {
     OSStatus err = noErr ;
-    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxMacCFStringHolder(path ,wxLocale::GetSystemEncoding() ) ) ;
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxMacCFStringHolder(path));
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
     CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
     CFRelease( cfMutableString );

src/mac/corefoundation/cfstring.cpp

@@ -105,9 +105,10 @@ wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
 #if wxUSE_GUI
         encoding = wxFont::GetDefaultEncoding() ;
 #else
-        encoding = wxLocale::GetSystemEncoding() ;
+        encoding = wxFONTENCODING_SYSTEM; // to be set below
 #endif
     }
+
     if ( encoding == wxFONTENCODING_SYSTEM )
     {
         enc = CFStringGetSystemEncoding();

src/mac/corefoundation/utilsexc_base.cpp

@@ -51,7 +51,7 @@
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
-//	wxMacExecute
+//    wxMacExecute
 //
 // argv is the command line split up, with the application path first
 // flags are the flags from wxExecute
@@ -63,8 +63,8 @@ long wxMacExecute(wxChar **argv,
                wxProcess *process)
 {
     // Semi-macros used for return value of wxMacExecute
-	const long errorCode = ((flags & wxEXEC_SYNC) ? -1 : 0);
+    const long errorCode = ((flags & wxEXEC_SYNC) ? -1 : 0);
-	const long successCode = ((flags & wxEXEC_SYNC) ? 0 : -1); // fake PID
+    const long successCode = ((flags & wxEXEC_SYNC) ? 0 : -1); // fake PID
 
     // Obtains the number of arguments for determining the size of
     // the CFArray used to hold them
@@ -90,8 +90,7 @@ long wxMacExecute(wxChar **argv,
     CFURLRef cfurlApp =
         CFURLCreateWithFileSystemPath(
             kCFAllocatorDefault,
-            wxMacCFStringHolder(path, 
+            wxMacCFStringHolder(path),
-                                wxLocale::GetSystemEncoding()),
             kDefaultPathStyle,
             true); //false == not a directory
 
@@ -151,16 +150,15 @@ long wxMacExecute(wxChar **argv,
             continue;
 
 
-        CFURLRef cfurlCurrentFile;	// CFURL to hold file path
+        CFURLRef cfurlCurrentFile;    // CFURL to hold file path
-        wxFileName argfn(*argv); 	// Filename for path
+        wxFileName argfn(*argv);     // Filename for path
 
         if(argfn.DirExists())
         {
             // First, try creating as a directory
             cfurlCurrentFile = CFURLCreateWithFileSystemPath(
                                 kCFAllocatorDefault,
-                                wxMacCFStringHolder(*argv, 
+                                wxMacCFStringHolder(*argv),
-                                wxLocale::GetSystemEncoding()),
                                 kDefaultPathStyle,
                                 true); //true == directory
         }
@@ -170,8 +168,7 @@ long wxMacExecute(wxChar **argv,
             // as a regular file
             cfurlCurrentFile = CFURLCreateWithFileSystemPath(
                                 kCFAllocatorDefault,
-                                wxMacCFStringHolder(*argv, 
+                                wxMacCFStringHolder(*argv),
-                                wxLocale::GetSystemEncoding()),
                                 kDefaultPathStyle,
                                 false); //false == regular file
         }
@@ -181,9 +178,9 @@ long wxMacExecute(wxChar **argv,
             // an entry in the local filesystem,
             // so try creating it through CFURLCreateWithString
             cfurlCurrentFile = CFURLCreateWithString(
-                    kCFAllocatorDefault,
+                                kCFAllocatorDefault,
-                wxMacCFStringHolder(*argv, wxLocale::GetSystemEncoding()),
+                                wxMacCFStringHolder(*argv),
-                    NULL);
+                                NULL);
         }
 
         // Continue in the loop if the CFURL could not be created