linking fixes

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 888fabd96c87d9934d47a4eead6268d874adfb19..109cb88311584d8351b5b9ec86ab7c728b7387cc 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -78,6 +78,7 @@
 #endif // native Win compiler
 
 #ifdef __GNUWIN32__
 #endif // native Win compiler
 
 #ifdef __GNUWIN32__

+    #include <wchar.h>

     #ifndef __TWIN32__
         #include <sys/unistd.h>
     #endif
     #ifndef __TWIN32__
         #include <sys/unistd.h>
     #endif


@@ -845,7 +846,6 @@ void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
     FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
 }
 
     FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
 }
 

-/*

 static char sMacFileNameConversion[ 1000 ] ;
 
 wxString wxMac2UnixFilename (const char *str)
 static char sMacFileNameConversion[ 1000 ] ;
 
 wxString wxMac2UnixFilename (const char *str)


@@ -917,17 +917,12 @@ wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
     return wxMac2UnixFilename( wxMacFSSpec2MacFilename( 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 ) ;
 }
 void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
 {
     wxString var = wxUnix2MacFilename( path ) ;
     wxMacFilename2FSSpec( var , spec ) ;
 }

-*/
+

 #endif
 void
 wxDos2UnixFilename (char *s)
 #endif
 void
 wxDos2UnixFilename (char *s)


@@ -1113,7 +1108,10 @@ wxRenameFile (const wxString& file1, const wxString& file2)
 
 bool wxRemoveFile(const wxString& file)
 {
 
 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));
   int res = wxRemove(file);
 #else
   int res = unlink(OS_FILENAME(file));