X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e987a489c8fa978f90b15a6630dfb7761b97e671..f51a6f6a0c11f2d5ce58bcb858f5dfa1c27299a5:/src/common/filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 968a1d14a5..a377d28958 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -78,6 +78,7 @@
 #endif // native Win compiler
 
 #ifdef __GNUWIN32__
+    #include <wchar.h>
     #ifndef __TWIN32__
         #include <sys/unistd.h>
     #endif
@@ -142,11 +143,7 @@ const off_t wxInvalidOffset = (off_t)-1;
 // ----------------------------------------------------------------------------
 
 // we need to translate Mac filenames before passing them to OS functions
-#ifdef __MAC__
-    #define OS_FILENAME(s) (wxUnix2MacFilename(s))
-#else
     #define OS_FILENAME(s) (s.fn_str())
-#endif
 
 // ============================================================================
 // implementation
@@ -289,6 +286,14 @@ wxFileExists (const wxString& filename)
 bool
 wxIsAbsolutePath (const wxString& filename)
 {
+#ifdef __WXMAC__
+  if (filename != wxT(""))
+  {
+    if( filename.Find(':') != wxNOT_FOUND && filename[0] != ':' )
+      return TRUE ;
+  }
+  return FALSE ;
+#else
   if (filename != wxT(""))
     {
       if (filename[0] == wxT('/')
@@ -303,6 +308,7 @@ wxIsAbsolutePath (const wxString& filename)
         return TRUE;
     }
   return FALSE;
+#endif
 }
 
 /*
@@ -652,11 +658,15 @@ wxChar *wxFileNameFromPath (wxChar *path)
       tcp = path + wxStrlen (path);
       while (--tcp >= path)
         {
+#ifdef __WXMAC__
+          if (*tcp == wxT(':') )
+#else
           if (*tcp == wxT('/') || *tcp == wxT('\\')
 #ifdef __VMS__
      || *tcp == wxT(':') || *tcp == wxT(']'))
 #else
      )
+#endif
 #endif
             return tcp + 1;
         }                        /* while */
@@ -679,11 +689,15 @@ wxString wxFileNameFromPath (const wxString& path1)
       tcp = path + wxStrlen (path);
       while (--tcp >= path)
           {
+#ifdef __WXMAC__
+           if (*tcp == wxT(':') )
+#else
             if (*tcp == wxT('/') || *tcp == wxT('\\')
 #ifdef __VMS__
         || *tcp == wxT(':') || *tcp == wxT(']'))
 #else
         )
+#endif
 #endif
                 return wxString(tcp + 1);
             }                        /* while */
@@ -717,7 +731,11 @@ wxPathOnly (wxChar *path)
       while (!done && i > -1)
       {
         // ] is for VMS
+#ifdef __WXMAC__
+        if (path[i] == wxT(':') )
+#else
         if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
+#endif
         {
           done = TRUE;
 #ifdef __VMS__
@@ -766,7 +784,11 @@ wxString wxPathOnly (const wxString& path)
       while (!done && i > -1)
       {
         // ] is for VMS
+#ifdef __WXMAC__
+        if (path[i] == wxT(':') )
+#else
         if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
+#endif
         {
           done = TRUE;
 #ifdef __VMS__
@@ -801,7 +823,30 @@ wxString wxPathOnly (const wxString& path)
 // Also, convert to lower case, since case is significant in UNIX.
 
 #if defined(__WXMAC__) && !defined(__UNIX__)
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
+{
+    Handle    myPath ;
+    short     length ;
+
+    FSpGetFullPath( spec , &length , &myPath ) ;
+    ::SetHandleSize( myPath , length + 1 ) ;
+    ::HLock( myPath ) ;
+    (*myPath)[length] = 0 ;
+    if ( length > 0 && (*myPath)[length-1] ==':' )
+        (*myPath)[length-1] = 0 ;
 
+    wxString result(     (char*) *myPath ) ;
+    ::HUnlock( myPath ) ;
+    ::DisposeHandle( myPath ) ;
+    return result ;
+}
+
+void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
+{
+    FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
+}
+
+/*
 static char sMacFileNameConversion[ 1000 ] ;
 
 wxString wxMac2UnixFilename (const char *str)
@@ -868,24 +913,6 @@ wxString wxUnix2MacFilename (const char *str)
   return wxString (sMacFileNameConversion) ;
 }
 
-wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
-{
-    Handle    myPath ;
-    short     length ;
-
-    FSpGetFullPath( spec , &length , &myPath ) ;
-    ::SetHandleSize( myPath , length + 1 ) ;
-    ::HLock( myPath ) ;
-    (*myPath)[length] = 0 ;
-    if ( length > 0 && (*myPath)[length-1] ==':' )
-        (*myPath)[length-1] = 0 ;
-
-    wxString result(     (char*) *myPath ) ;
-    ::HUnlock( myPath ) ;
-    ::DisposeHandle( myPath ) ;
-    return result ;
-}
-
 wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
 {
     return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
@@ -901,7 +928,7 @@ void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
     wxString var = wxUnix2MacFilename( path ) ;
     wxMacFilename2FSSpec( var , spec ) ;
 }
-
+*/
 #endif
 void
 wxDos2UnixFilename (char *s)
@@ -1087,7 +1114,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));
@@ -1099,7 +1129,7 @@ bool wxRemoveFile(const wxString& file)
 bool wxMkdir(const wxString& dir, int perm)
 {
 #if defined(__WXMAC__) && !defined(__UNIX__)
-  return (mkdir(wxUnix2MacFilename( dir ) , 0 ) == 0);
+  return (mkdir( dir , 0 ) == 0);
 #else // !Mac
     const wxChar *dirname = dir.c_str();
 
@@ -1395,7 +1425,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
 
     FSSpec fsspec ;
 
-    wxUnixFilename2FSSpec( result , &fsspec ) ;
+    wxMacFilename2FSSpec( result , &fsspec ) ;
     g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
     g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ;
     g_iter.m_index = 0 ;
@@ -1443,7 +1473,7 @@ wxString wxFindNextFile()
                                    g_iter.m_name,
                                    &spec) ;
 
-    return wxMacFSSpec2UnixFilename( &spec ) ;
+    return wxMacFSSpec2MacFilename( &spec ) ;
 }
 
 #elif defined(__WXMSW__)
@@ -1697,7 +1727,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
 		cwdSpec.vRefNum = pb.ioFCBVRefNum;
 		cwdSpec.parID = pb.ioFCBParID;
 		cwdSpec.name[0] = 0 ;
-		wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+		wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
 		
 		strcpy( buf , res ) ;
 		buf[res.length()-1]=0 ;