X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd378f94bec1edc0f991ee55b02bfe3084de94e0..4f55a07f9f4c6ba6905aaa8e584e6fb14771d278:/src/common/filefn.cpp diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 888fabd96c..109cb88311 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -78,6 +78,7 @@ #endif // native Win compiler #ifdef __GNUWIN32__ + #include #ifndef __TWIN32__ #include #endif @@ -845,7 +846,6 @@ void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) FSpLocationFromFullPath( strlen(path ) , path , spec ) ; } -/* static char sMacFileNameConversion[ 1000 ] ; wxString wxMac2UnixFilename (const char *str) @@ -917,17 +917,12 @@ wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ; } -void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) -{ - FSpLocationFromFullPath( strlen(path ) , path , spec ) ; -} - void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) { wxString var = wxUnix2MacFilename( path ) ; wxMacFilename2FSSpec( var , spec ) ; } -*/ + #endif void wxDos2UnixFilename (char *s) @@ -1113,7 +1108,10 @@ wxRenameFile (const wxString& file1, const wxString& file2) bool wxRemoveFile(const wxString& file) { -#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) +#if defined(__VISUALC__) \ + || defined(__BORLANDC__) \ + || defined(__WATCOMC__) \ + || defined(__GNUWIN32__) int res = wxRemove(file); #else int res = unlink(OS_FILENAME(file));