X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f73bc315aac67f087106454a7f23a8a0d3a4bda2..7424a6375b3dd1e080848ec215b5e8b071240326:/src/common/filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 80c870d8b8..1d7119cabe 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -196,25 +196,6 @@ const off_t wxInvalidOffset = (off_t)-1;
 // implementation
 // ============================================================================
 
-#if defined(__WXMAC__) && !defined(__DARWIN__) && !defined(wxUSE_UNICODE)
-
-WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
-{
-    return stat( wxMacStringToCString( file_name ), buf );
-}
-
-WXDLLEXPORT int wxAccess( const wxChar *pathname, int mode )
-{
-    return access( wxMacStringToCString( pathname ), mode );
-}
-
-WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode )
-{
-    return open( wxMacStringToCString( pathname ), flags, mode );
-}
-
-#endif
-
 #ifdef wxNEED_WX_UNISTD_H
 
 WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
@@ -344,8 +325,7 @@ wxString wxPathList::FindValidPath (const wxString& file)
   wxChar buf[_MAXPATHLEN];
   wxStrcpy(buf, wxFileFunctionsBuffer);
 
-  wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
-  filename = wxIsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
+  wxChar *filename = wxIsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
 
   for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
     {
@@ -751,9 +731,9 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
 #endif
 
   // Handle environment
-  const wxChar *val = (const wxChar *) NULL;
+  const wxChar *val;
 #ifndef __WXWINCE__
-  wxChar *tcp = (wxChar *) NULL;
+  wxChar *tcp;
   if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
      (tcp = wxStrstr (dest, val)) != NULL)
     {
@@ -767,7 +747,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
 #endif
 
   // Handle User's home (ignore root homes!)
-  size_t len = 0;
+  size_t len;
   if ((val = wxGetUserHome (user)) != NULL &&
       (len = wxStrlen(val)) > 2 &&
       wxStrncmp(dest, val, len) == 0)
@@ -991,7 +971,7 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
         (*myPath)[length-1] = 0 ;
 
     // create path string for return value
-    wxString result = wxMacMakeStringFromCString( *myPath ) ;
+    wxString result( *myPath , wxConvLocal) ;
 
     // free allocated handle
     ::HUnlock( myPath ) ;
@@ -1037,7 +1017,7 @@ void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
 #if wxUSE_UNICODE
 WXDLLEXPORT void wxMacFilename2FSSpec( const wxChar *path , FSSpec *spec ) 
 {
-    return wxMacFilename2FSSpec( wxMacStringToCString( wxString( path ) ) , spec ) ;
+    return wxMacFilename2FSSpec( wxConvFile.cWC2MB(path) , spec ) ;
 }
 #endif
 
@@ -1163,9 +1143,9 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
   if ( !wxGetTempFileName( wxT("cat"), outfile) )
       return FALSE;
 
-  FILE *fp1 = (FILE *) NULL;
-  FILE *fp2 = (FILE *) NULL;
-  FILE *fp3 = (FILE *) NULL;
+  FILE *fp1 wxDUMMY_INITIALIZE(NULL);
+  FILE *fp2 = NULL;
+  FILE *fp3 = NULL;
   // Open the inputs and outputs
   if ((fp1 = wxFopen ( file1, wxT("rb"))) == NULL ||
       (fp2 = wxFopen ( file2, wxT("rb"))) == NULL ||
@@ -1473,7 +1453,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
         return wxEmptyString;
     }
 
-    int dirFlags = 0;
+    int dirFlags;
     switch (flags)
     {
         case wxDIR:  dirFlags = wxDIR_DIRS; break;
@@ -1522,7 +1502,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
         buf = new wxChar[sz + 1];
     }
 
-    bool ok = FALSE;
+    bool ok wxDUMMY_INITIALIZE(FALSE);
 
     // for the compilers which have Unicode version of _getcwd(), call it
     // directly, for the others call the ANSI version and do the translation