added carbonaccessors.o

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index fef89de43f3e0d7031e4a2150389e40e2c63044d..b9c16cd304111bccdfdfd23a3f90d069d2d25225 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -287,16 +287,16 @@ bool
 wxIsAbsolutePath (const wxString& filename)
 {
 #ifdef __WXMAC__
 wxIsAbsolutePath (const wxString& filename)
 {
 #ifdef __WXMAC__

-  if (filename != wxT(""))
-  {
-//  This seems wrong to me, RR. FIXME.
+    if (filename != wxT(""))
+    {
+        // This seems wrong to me, but there is no fix. since
+        // "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
+        // is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.

     
     

-    if( filename.Find(':') != wxNOT_FOUND && filename[0] != ':' )
-      return TRUE ;
-      
-//    if (filename[0] == ':')  return TRUE ;
-  }
-  return FALSE ;
+        if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
+            return TRUE ;
+    }
+    return FALSE ;

 #else
   if (filename != wxT(""))
     {
 #else
   if (filename != wxT(""))
     {


@@ -1179,7 +1179,7 @@ bool wxPathExists(const wxChar *pszPathName)
     while ( wxEndsWithPathSeparator(strPath) )
     {
         size_t len = strPath.length();
     while ( wxEndsWithPathSeparator(strPath) )
     {
         size_t len = strPath.length();

-        if ( len == 1 || strPath[len - 1] == _T(':') )
+        if ( len == 1 || (len == 3 && strPath[len - 2] == _T(':')) )

             break;
 
         strPath.Truncate(len - 1);
             break;
 
         strPath.Truncate(len - 1);