Reverted due to Darwin conflict.

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index bff8bd1bc717e56667ef029cfce3367b6ee45db0..eab5a6c4b0af954f237feb6a791f793d6b9244cc 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -31,7 +31,7 @@
 
 #include "wx/utils.h"
 #include "wx/intl.h"
 
 #include "wx/utils.h"
 #include "wx/intl.h"

-#include "wx/file.h"
+#include "wx/file.h" // This does include filefn.h

 #include "wx/filename.h"
 #include "wx/dir.h"
 
 #include "wx/filename.h"
 #include "wx/dir.h"
 


@@ -54,76 +54,6 @@
     #include  "wx/mac/private.h"  // includes mac headers
 #endif
 
     #include  "wx/mac/private.h"  // includes mac headers
 #endif
 

-#ifdef __WXWINCE__
-#include "wx/msw/wince/time.h"
-#include "wx/msw/private.h"
-#else
-#include <time.h>
-#endif
-
-#ifdef __WXWINCE__
-// Nothing
-#elif !defined(__MWERKS__)
-    #include <sys/types.h>
-    #include <sys/stat.h>
-#else
-#ifdef __MACH__
-#include <sys/types.h>
-#include <utime.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#else
-    #include <stat.h>
-    #include <unistd.h>
-    #include <unix.h>
-    #include <fcntl.h>
-#endif
-#endif
-
-#ifdef __OS2__
-// need to check for __OS2__ first since currently both
-// __OS2__ and __UNIX__ are defined.
-    #include <process.h>
-    #include "wx/os2/private.h"
-#ifdef __EMX__
-    #include <unistd.h>
-#endif
-#elif defined(__UNIX__)
-    #include <unistd.h>
-    #include <dirent.h>
-    #include <fcntl.h>
-#endif
-
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__)
-    #include <direct.h>
-    #include <dos.h>
-    #include <io.h>
-#endif // __WINDOWS__
-#endif // native Win compiler
-
-#if defined(__DOS__)
-    #ifdef __WATCOMC__
-        #include <direct.h>
-        #include <dos.h>
-        #include <io.h>
-    #endif
-    #ifdef __DJGPP__
-        #include <unistd.h>
-    #endif
-#endif
-
-#ifdef __BORLANDC__ // Please someone tell me which version of Borland needs
-                    // this (3.1 I believe) and how to test for it.
-                    // If this works for Borland 4.0 as well, then no worries.
-    #include <dir.h>
-#endif
-
-#ifdef __SALFORDC__
-    #include <dir.h>
-    #include <unix.h>
-#endif
-

 #include "wx/log.h"
 
 // No, Cygwin doesn't appear to have fnmatch.h after all.
 #include "wx/log.h"
 
 // No, Cygwin doesn't appear to have fnmatch.h after all.


@@ -135,11 +65,6 @@
     #include "wx/msw/wrapwin.h"
     #include "wx/msw/mslu.h"
 
     #include "wx/msw/wrapwin.h"
     #include "wx/msw/mslu.h"
 

-    // for _getcwd
-    #ifdef __MINGW32__
-        #include <io.h>
-    #endif
-

     // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
     //
     // note that it must be included after <windows.h>
     // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
     //
     // note that it must be included after <windows.h>


@@ -164,14 +89,7 @@
 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

-#  ifdef __DARWIN__

 #    include "MoreFilesX.h"
 #    include "MoreFilesX.h"

-#  else
-#    include "MoreFiles.h"
-#    include "MoreFilesExtras.h"
-#    include "FullPath.h"
-#    include "FSpCompat.h"
-#  endif

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -316,9 +234,9 @@ bool wxPathList::Member (const wxString& path)
           path.CompareTo (path2) == 0
 #endif
         )
           path.CompareTo (path2) == 0
 #endif
         )

-        return TRUE;
+        return true;

   }
   }

-  return FALSE;
+  return false;

 }
 
 wxString wxPathList::FindValidPath (const wxString& file)
 }
 
 wxString wxPathList::FindValidPath (const wxString& file)


@@ -397,23 +315,23 @@ wxIsAbsolutePath (const wxString& filename)
         // "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] != ':')
         // "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 ;
+            return true ;

 #else
         // Unix like or Windows
         if (filename[0] == wxT('/'))
 #else
         // Unix like or Windows
         if (filename[0] == wxT('/'))

-            return TRUE;
+            return true;

 #endif
 #ifdef __VMS__
         if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
 #endif
 #ifdef __VMS__
         if ((filename[0] == wxT('[') && filename[1] != wxT('.')))

-            return TRUE;
+            return true;

 #endif
 #if defined(__WINDOWS__) || defined(__OS2__)
         // MSDOS like
         if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
 #endif
 #if defined(__WINDOWS__) || defined(__OS2__)
         // MSDOS like
         if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))

-            return TRUE;
+            return true;

 #endif
     }
 #endif
     }

-    return FALSE ;
+    return false ;

 }
 
 /*
 }
 
 /*


@@ -571,9 +489,9 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     trimchars[3] = 0;
 
 #ifdef __WXMSW__
     trimchars[3] = 0;
 
 #ifdef __WXMSW__

-     const wxChar     SEP = wxT('\\');
+    const wxChar     SEP = wxT('\\');

 #else
 #else

-     const wxChar     SEP = wxT('/');
+    const wxChar     SEP = wxT('/');

 #endif
     buf[0] = wxT('\0');
     if (name == NULL || *name == wxT('\0'))
 #endif
     buf[0] = wxT('\0');
     if (name == NULL || *name == wxT('\0'))


@@ -879,6 +797,9 @@ wxString wxPathOnly (const wxString& path)
             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {
             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {

+                // Don't return an empty string
+                if (i == 0)
+                    i ++;

                 buf[i] = 0;
                 return wxString(buf);
             }
                 buf[i] = 0;
                 return wxString(buf);
             }


@@ -912,219 +833,71 @@ wxString wxPathOnly (const wxString& path)
 // Also, convert to lower case, since case is significant in UNIX.
 
 #if defined(__WXMAC__)
 // Also, convert to lower case, since case is significant in UNIX.
 
 #if defined(__WXMAC__)

-wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
-{
-#ifdef __DARWIN__
-    int         i;
-    int         j;
-    OSErr       theErr;
-    OSStatus    theStatus = noErr;
-    Boolean     isDirectory = FALSE;
-    Str255    theParentPath = "\p";
-    FSSpec      theParentSpec;
-    FSRef       theParentRef;
-    FSRef       theRef ;
-    char        theFileName[FILENAME_MAX];
-    char        thePath[FILENAME_MAX];
-
-    // we loose the long filename by merely copying the spec->name
-    // so try the built-ins, which only work if the file exists, but still...
-    
-    theErr = FSpMakeFSRef(spec, &theRef);
-    if ( theErr == noErr )
-    {
-       CFURLRef fullURLRef;
-        fullURLRef = ::CFURLCreateFromFSRef(NULL, &theRef);
-#ifdef __UNIX__
-       CFURLPathStyle pathstyle = kCFURLPOSIXPathStyle;
-#else
-       CFURLPathStyle pathstyle = kCFURLHFSPathStyle;
-#endif
-       CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, pathstyle);
-       ::CFRelease( fullURLRef ) ;
-       return wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding());
-    }
-
-    strcpy(thePath, "");
-
-    // GD: Separate file name from path and make a FSRef to the parent
-    //     directory. This is necessary since FSRefs cannot reference files
-    //     that have not yet been created.
-    //     Based on example code from Apple Technical Note TN2022
-    //       http://developer.apple.com/technotes/tn/tn2022.html
-
-    // check whether we are converting a directory
-    isDirectory = ((spec->name)[spec->name[0]] == ':');
-    // count length of file name
-    for (i = spec->name[0] - (isDirectory ? 1 : 0); ((spec->name[i] != ':') && (i > 0)); i--);
-    // copy file name
-    //   prepend path separator since it will later be appended to the path
-    theFileName[0] = wxFILE_SEP_PATH;
-    for (j = i + 1; j <= spec->name[0] - (isDirectory ? 1 : 0); j++) {
-        theFileName[j - i] = spec->name[j];
-    }
-    theFileName[j - i] = '\0';
-    // copy path if any
-    for (j = 1; j <= i; j++) {
-        theParentPath[++theParentPath[0]] = spec->name[j];
-    }
-    theErr = FSMakeFSSpec(spec->vRefNum, spec->parID, theParentPath, &theParentSpec);
-    if (theErr == noErr) {
-        // convert the FSSpec to an FSRef
-        theErr = FSpMakeFSRef(&theParentSpec, &theParentRef);
-    }
-    if (theErr == noErr) {
-        // get the POSIX path associated with the FSRef
-        theStatus = FSRefMakePath(&theParentRef,
-                                  (UInt8 *)thePath, sizeof(thePath));
-    }
-    if (theStatus == noErr) {
-        // append file name to path
-        //   includes previously prepended path separator
-        strcat(thePath, theFileName);
-    }

 
 

-    // create path string for return value
-    wxString result( thePath , wxConvLocal) ;
+#if TARGET_API_MAC_OSX
+#define kDefaultPathStyle kCFURLPOSIXPathStyle

 #else
 #else

-    Handle    myPath ;
-    short     length ;
-
-    // get length of path and allocate handle
-    FSpGetFullPath( spec , &length , &myPath ) ;
-    ::SetHandleSize( myPath , length + 1 ) ;
-    ::HLock( myPath ) ;
-    (*myPath)[length] = 0 ;
-    if ((length > 0) && ((*myPath)[length-1] == ':'))
-        (*myPath)[length-1] = 0 ;
-
-    // create path string for return value
-    wxString result( *myPath , wxConvLocal) ;
-
-    // free allocated handle
-    ::HUnlock( myPath ) ;
-    ::DisposeHandle( myPath ) ;
+#define kDefaultPathStyle kCFURLHFSPathStyle

 #endif
 
 #endif
 

-    return result ;
+wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
+{
+    CFURLRef fullURLRef;
+    fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
+    if ( additionalPathComponent )
+    {
+        CFURLRef parentURLRef = fullURLRef ;
+        fullURLRef = CFURLCreateCopyAppendingPathComponent(NULL, parentURLRef,
+            additionalPathComponent,false);
+        CFRelease( parentURLRef ) ;
+    }
+    CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle);
+    CFRelease( fullURLRef ) ;
+    return wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding());

 }
 }

-#ifndef __DARWIN__
-// Mac file names are POSIX (Unix style) under Darwin
-// therefore the conversion functions below are not needed
-
-static wxChar sMacFileNameConversion[ 1000 ] ;
-static char scMacFileNameConversion[ 1000 ] ;

 
 

-#endif
-void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
+OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )

 {
     OSStatus err = noErr ;
 {
     OSStatus err = noErr ;

-#ifdef __DARWIN__
-    FSRef theRef;
-
-    // get the FSRef associated with the POSIX path
-    err = FSPathMakeRef((const UInt8 *) path, &theRef, NULL);
-    // convert the FSRef to an FSSpec
-    err = FSGetCatalogInfo(&theRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
-#else
-    if ( strchr( path , ':' ) == NULL )
+    CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, wxMacCFStringHolder(path ,wxLocale::GetSystemEncoding() ) , kDefaultPathStyle, false);
+    if ( NULL != url )

     {
     {

-        // try whether it is a volume / or a mounted volume
-        strncpy( scMacFileNameConversion , path , 1000 ) ;
-        scMacFileNameConversion[998] = 0 ;
-        strcat( scMacFileNameConversion , ":" ) ;
-        err = FSpLocationFromFullPath( strlen(scMacFileNameConversion) , scMacFileNameConversion , spec ) ;
+        if ( CFURLGetFSRef(url, fsRef) == false )
+            err = fnfErr ;
+        CFRelease( url ) ;

     }
     else
     {
     }
     else
     {

-        err = FSpLocationFromFullPath( strlen(path) , path , spec ) ;
+        err = fnfErr ;

     }
     }

-#endif
+    return err ;

 }
 
 }
 

-#if wxUSE_UNICODE
-WXDLLEXPORT void wxMacFilename2FSSpec( const wxChar *path , FSSpec *spec ) 
+wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )

 {
 {

-    return wxMacFilename2FSSpec( wxConvFile.cWC2MB(path) , spec ) ;
-}
-#endif
-
-#ifndef __DARWIN__
-
-wxString wxMac2UnixFilename (const wxChar *str)
-{
-    wxChar *s = sMacFileNameConversion ;
-    wxStrcpy( s , str ) ;
-    if (s)
-    {
-        memmove( s+1 , s ,wxStrlen( s ) + 1 * sizeof(wxChar)) ;
-        if ( *s == ':' )
-            *s = '.' ;
-        else
-            *s = '/' ;
-
-        while (*s)
-        {
-            if (*s == ':')
-                *s = '/';
-            else
-                *s = wxTolower(*s);        // Case INDEPENDENT
-            s++;
-        }
-    }
-    return wxString(sMacFileNameConversion) ;
+    CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
+                                                      uniname->unicode,
+                                                      uniname->length );
+    return wxMacCFStringHolder(cfname).AsString() ;

 }
 
 }
 

-wxString wxUnix2MacFilename (const wxChar *str)
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )

 {
 {

-    wxChar *s = sMacFileNameConversion ;
-    wxStrcpy( s , str ) ;
-    if (s)
+    FSRef fsRef ;
+    if ( FSpMakeFSRef( spec , &fsRef) == noErr )

     {
     {

-        if ( *s == '.' )
-        {
-            // relative path , since it goes on with slash which is translated to a :
-            memmove( s , s+1 ,wxStrlen( s ) * sizeof(wxChar)) ;
-        }
-        else if ( *s == '/' )
-        {
-            // absolute path -> on mac just start with the drive name
-            memmove( s , s+1 ,wxStrlen( s ) * sizeof(wxChar) ) ;
-        }
-        else
-        {
-            wxASSERT_MSG( 1 , wxT("unkown path beginning") ) ;
-        }
-        while (*s)
-        {
-            if (*s == '/' || *s == '\\')
-            {
-                // convert any back-directory situations
-                if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) )
-                {
-                    *s = ':';
-                    memmove( s+1 , s+3 ,(wxStrlen( s+3 ) + 1)*sizeof(wxChar) ) ;
-                }
-                else
-                    *s = ':';
-            }
-            s++ ;
-        }
+        return wxMacFSRefToPath( &fsRef ) ;

     }
     }

-    return wxString(sMacFileNameConversion) ;
+    return wxEmptyString ;

 }
 
 }
 

-wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
+void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )

 {
 {

-    return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
-}
-
-void wxUnixFilename2FSSpec( const wxChar *path , FSSpec *spec )
-{
-    wxString var = wxUnix2MacFilename( path ) ;
-    wxMacFilename2FSSpec( var , spec ) ;
+    OSStatus err = noErr ;
+    FSRef fsRef ;
+    wxMacPathToFSRef( path , &fsRef ) ;
+    err = FSRefMakeFSSpec( &fsRef , spec ) ;

 }
 }

-#endif // ! __DARWIN__

 
 #endif // __WXMAC__
 
 
 #endif // __WXMAC__
 


@@ -1138,7 +911,7 @@ wxDos2UnixFilename (wxChar *s)
           *s = _T('/');
 #ifdef __WXMSW__
         else
           *s = _T('/');
 #ifdef __WXMSW__
         else

-          *s = wxTolower (*s);        // Case INDEPENDENT
+          *s = (wxChar)wxTolower (*s);        // Case INDEPENDENT

 #endif
         s++;
       }
 #endif
         s++;
       }


@@ -1169,7 +942,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
 {
   wxString outfile;
   if ( !wxGetTempFileName( wxT("cat"), outfile) )
 {
   wxString outfile;
   if ( !wxGetTempFileName( wxT("cat"), outfile) )

-      return FALSE;
+      return false;

 
   FILE *fp1 wxDUMMY_INITIALIZE(NULL);
   FILE *fp2 = NULL;
 
   FILE *fp1 wxDUMMY_INITIALIZE(NULL);
   FILE *fp2 = NULL;


@@ -1185,7 +958,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
         fclose (fp2);
       if (fp3)
         fclose (fp3);
         fclose (fp2);
       if (fp3)
         fclose (fp3);

-      return FALSE;
+      return false;

     }
 
   int ch;
     }
 
   int ch;


@@ -1216,11 +989,11 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
         wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
                       file1.c_str(), file2.c_str());
 
         wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
                       file1.c_str(), file2.c_str());
 

-        return FALSE;
+        return false;

     }
 #elif defined(__OS2__)
     if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )
     }
 #elif defined(__OS2__)
     if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )

-        return FALSE;
+        return false;

 #else // !Win32
 
     wxStructStat fbuf;
 #else // !Win32
 
     wxStructStat fbuf;


@@ -1231,13 +1004,13 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
         // from it anyhow
         wxLogSysError(_("Impossible to get permissions for file '%s'"),
                       file1.c_str());
         // from it anyhow
         wxLogSysError(_("Impossible to get permissions for file '%s'"),
                       file1.c_str());

-        return FALSE;
+        return false;

     }
 
     // open file1 for reading
     wxFile fileIn(file1, wxFile::read);
     if ( !fileIn.IsOpened() )
     }
 
     // open file1 for reading
     wxFile fileIn(file1, wxFile::read);
     if ( !fileIn.IsOpened() )

-        return FALSE;
+        return false;

 
     // remove file2, if it exists. This is needed for creating
     // file2 with the correct permissions in the next step
 
     // remove file2, if it exists. This is needed for creating
     // file2 with the correct permissions in the next step


@@ -1245,26 +1018,19 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
     {
         wxLogSysError(_("Impossible to overwrite the file '%s'"),
                       file2.c_str());
     {
         wxLogSysError(_("Impossible to overwrite the file '%s'"),
                       file2.c_str());

-        return FALSE;
+        return false;

     }
 
     }
 

-#ifdef __UNIX__

     // reset the umask as we want to create the file with exactly the same
     // permissions as the original one
     // reset the umask as we want to create the file with exactly the same
     // permissions as the original one

-    mode_t oldUmask = umask( 0 );
-#endif // __UNIX__
+    wxCHANGE_UMASK(0);

 
     // create file2 with the same permissions than file1 and open it for
     // writing
 
     wxFile fileOut;
     if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )
 
     // create file2 with the same permissions than file1 and open it for
     // writing
 
     wxFile fileOut;
     if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )

-        return FALSE;
-
-#ifdef __UNIX__
-    /// restore the old umask
-    umask(oldUmask);
-#endif // __UNIX__
+        return false;

 
     // copy contents of file1 to file2
     char buf[4096];
 
     // copy contents of file1 to file2
     char buf[4096];


@@ -1273,21 +1039,21 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
     {
         count = fileIn.Read(buf, WXSIZEOF(buf));
         if ( fileIn.Error() )
     {
         count = fileIn.Read(buf, WXSIZEOF(buf));
         if ( fileIn.Error() )

-            return FALSE;
+            return false;

 
         // end of file?
         if ( !count )
             break;
 
         if ( fileOut.Write(buf, count) < count )
 
         // end of file?
         if ( !count )
             break;
 
         if ( fileOut.Write(buf, count) < count )

-            return FALSE;
+            return false;

     }
 
     // we can expect fileIn to be closed successfully, but we should ensure
     // that fileOut was closed as some write errors (disk full) might not be
     // detected before doing this
     if ( !fileIn.Close() || !fileOut.Close() )
     }
 
     // we can expect fileIn to be closed successfully, but we should ensure
     // that fileOut was closed as some write errors (disk full) might not be
     // detected before doing this
     if ( !fileIn.Close() || !fileOut.Close() )

-        return FALSE;
+        return false;

 
 #if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
     // no chmod in VA.  Should be some permission API for HPFS386 partitions
 
 #if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
     // no chmod in VA.  Should be some permission API for HPFS386 partitions


@@ -1296,12 +1062,12 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());
     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());

-        return FALSE;
+        return false;

     }
 #endif // OS/2 || Mac
 #endif // __WXMSW__ && __WIN32__
 
     }
 #endif // OS/2 || Mac
 #endif // __WXMSW__ && __WIN32__
 

-    return TRUE;
+    return true;

 }
 
 bool
 }
 
 bool


@@ -1310,16 +1076,16 @@ wxRenameFile (const wxString& file1, const wxString& file2)
 #ifndef __WXWINCE__
     // Normal system call
   if ( wxRename (file1, file2) == 0 )
 #ifndef __WXWINCE__
     // Normal system call
   if ( wxRename (file1, file2) == 0 )

-    return TRUE;
+    return true;

 #endif
 
   // Try to copy
   if (wxCopyFile(file1, file2)) {
     wxRemoveFile(file1);
 #endif
 
   // Try to copy
   if (wxCopyFile(file1, file2)) {
     wxRemoveFile(file1);

-    return TRUE;
+    return true;

   }
   // Give up
   }
   // Give up

-  return FALSE;
+  return false;

 }
 
 bool wxRemoveFile(const wxString& file)
 }
 
 bool wxRemoveFile(const wxString& file)


@@ -1351,6 +1117,7 @@ bool wxMkdir(const wxString& dir, int perm)
     // for the GNU compiler
 #if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
   #if defined(MSVCRT)
     // for the GNU compiler
 #if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
   #if defined(MSVCRT)

+    wxUnusedVar(perm);

     if ( mkdir(wxFNCONV(dirname)) != 0 )
   #else
     if ( mkdir(wxFNCONV(dirname), perm) != 0 )
     if ( mkdir(wxFNCONV(dirname)) != 0 )
   #else
     if ( mkdir(wxFNCONV(dirname), perm) != 0 )


@@ -1377,17 +1144,17 @@ bool wxMkdir(const wxString& dir, int perm)
     {
         wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
 
     {
         wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 #endif // Mac/!Mac
 }
 
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #ifdef __VMS__
 #endif // Mac/!Mac
 }
 
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #ifdef __VMS__

-    return FALSE; //to be changed since rmdir exists in VMS7.x
+    return false; //to be changed since rmdir exists in VMS7.x

 #elif defined(__OS2__)
     return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
 #else
 #elif defined(__OS2__)
     return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
 #else


@@ -1538,14 +1305,14 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
         buf = new wxChar[sz + 1];
     }
 
         buf = new wxChar[sz + 1];
     }
 

-    bool ok wxDUMMY_INITIALIZE(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
 #if !wxUSE_UNICODE
     #define cbuf buf
 #else // wxUSE_UNICODE
 
     // for the compilers which have Unicode version of _getcwd(), call it
     // directly, for the others call the ANSI version and do the translation
 #if !wxUSE_UNICODE
     #define cbuf buf
 #else // wxUSE_UNICODE

-    bool needsANSI = TRUE;
+    bool needsANSI = true;

 
     #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
         // This is not legal code as the compiler
 
     #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
         // This is not legal code as the compiler


@@ -1559,11 +1326,11 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
         #if wxUSE_UNICODE_MSLU
             if ( wxGetOsVersion() != wxWIN95 )
         #else
         #if wxUSE_UNICODE_MSLU
             if ( wxGetOsVersion() != wxWIN95 )
         #else

-            char *cbuf = NULL; // never really used because needsANSI will always be FALSE
+            char *cbuf = NULL; // never really used because needsANSI will always be false

         #endif
             {
                 ok = _wgetcwd(buf, sz) != NULL;
         #endif
             {
                 ok = _wgetcwd(buf, sz) != NULL;

-                needsANSI = FALSE;
+                needsANSI = false;

             }
     #endif
 
             }
     #endif
 


@@ -1573,38 +1340,25 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
     #if defined(_MSC_VER) || defined(__MINGW32__)
         ok = _getcwd(cbuf, sz) != NULL;
     #elif defined(__WXMAC__) && !defined(__DARWIN__)
     #if defined(_MSC_VER) || defined(__MINGW32__)
         ok = _getcwd(cbuf, sz) != NULL;
     #elif defined(__WXMAC__) && !defined(__DARWIN__)

-        FSSpec cwdSpec ;
-        FCBPBRec pb;
-        OSErr error;
-        Str255  fileName ;
-        pb.ioNamePtr = (StringPtr) &fileName;
-        pb.ioVRefNum = 0;
-        pb.ioRefNum = LMGetCurApRefNum();
-        pb.ioFCBIndx = 0;
-        error = PBGetFCBInfoSync(&pb);
-        if ( error == noErr )
+        char lbuf[1024] ;
+        if ( getcwd( lbuf , sizeof( lbuf ) ) )

         {
         {

-            cwdSpec.vRefNum = pb.ioFCBVRefNum;
-            cwdSpec.parID = pb.ioFCBParID;
-            cwdSpec.name[0] = 0 ;
-            wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
-                       wxStrcpy( buf , res ) ;                 
-            ok = TRUE;
+            wxString res( lbuf , *wxConvCurrent ) ;
+            wxStrcpy( buf , res ) ;
+            ok = true;

         }
         else
         }
         else

-        {
-            ok = FALSE;
-        }
+            ok = false ;

     #elif defined(__OS2__)
         APIRET rc;
         ULONG ulDriveNum = 0;
         ULONG ulDriveMap = 0;
     #elif defined(__OS2__)
         APIRET rc;
         ULONG ulDriveNum = 0;
         ULONG ulDriveMap = 0;

-       rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
+        rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);

         ok = rc == 0;
         ok = rc == 0;

-       if (ok)
-       {
-           sz -= 3;
-           rc = ::DosQueryCurrentDir( 0 // current drive
+        if (ok)
+        {
+            sz -= 3;
+            rc = ::DosQueryCurrentDir( 0 // current drive

                                       ,cbuf + 3
                                       ,(PULONG)&sz
                                      );
                                       ,cbuf + 3
                                       ,(PULONG)&sz
                                      );


@@ -1681,11 +1435,11 @@ bool wxSetWorkingDirectory(const wxString& d)
 #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
     return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
 #elif defined(__WINDOWS__)
 #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
     return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
 #elif defined(__WINDOWS__)

-    
+

 #ifdef __WIN32__
 #ifdef __WXWINCE__
     // No equivalent in WinCE
 #ifdef __WIN32__
 #ifdef __WXWINCE__
     // No equivalent in WinCE

-    return FALSE;
+    return false;

 #else
     return (bool)(SetCurrentDirectory(d) != 0);
 #endif
 #else
     return (bool)(SetCurrentDirectory(d) != 0);
 #endif


@@ -1695,11 +1449,11 @@ bool wxSetWorkingDirectory(const wxString& d)
     if (isDriveSpec)
     {
         wxChar firstChar = d[0];
     if (isDriveSpec)
     {
         wxChar firstChar = d[0];

-        
+

         // To upper case
         if (firstChar > 90)
             firstChar = firstChar - 32;
         // To upper case
         if (firstChar > 90)
             firstChar = firstChar - 32;

-        
+

         // To a drive number
         unsigned int driveNo = firstChar - 64;
         if (driveNo > 0)
         // To a drive number
         unsigned int driveNo = firstChar - 64;
         if (driveNo > 0)


@@ -1709,10 +1463,10 @@ bool wxSetWorkingDirectory(const wxString& d)
         }
     }
     bool success = (chdir(WXSTRINGCAST d) == 0);
         }
     }
     bool success = (chdir(WXSTRINGCAST d) == 0);

-    
+

     return success;
 #endif
     return success;
 #endif

-    
+

 #endif
 }
 
 #endif
 }
 


@@ -1740,11 +1494,11 @@ bool wxEndsWithPathSeparator(const wxChar *pszFileName)
     return len && wxIsPathSeparator(pszFileName[len - 1]);
 }
 
     return len && wxIsPathSeparator(pszFileName[len - 1]);
 }
 

-// find a file in a list of directories, returns FALSE if not found
+// find a file in a list of directories, returns false if not found

 bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
 {
     // we assume that it's not empty
 bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
 {
     // we assume that it's not empty

-    wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE,
+    wxCHECK_MSG( !wxIsEmpty(pszFile), false,

                  _T("empty file name in wxFindFileInPath"));
 
     // skip path separator in the beginning of the file name if present
                  _T("empty file name in wxFindFileInPath"));
 
     // skip path separator in the beginning of the file name if present


@@ -1779,7 +1533,7 @@ bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFi
 
     delete [] szPath;
 
 
     delete [] szPath;
 

-    return pc != NULL;  // if TRUE => we breaked from the loop
+    return pc != NULL;  // if true => we breaked from the loop

 }
 
 void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
 }
 
 void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,


@@ -1813,13 +1567,13 @@ time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
             {
                 wxLogLastError(_T("FileTimeToLocalFileTime"));
             }
             {
                 wxLogLastError(_T("FileTimeToLocalFileTime"));
             }

-            
+

             SYSTEMTIME st;
             if ( !::FileTimeToSystemTime(&ftLocal, &st) )
             {
                 wxLogLastError(_T("FileTimeToSystemTime"));
             }
             SYSTEMTIME st;
             if ( !::FileTimeToSystemTime(&ftLocal, &st) )
             {
                 wxLogLastError(_T("FileTimeToSystemTime"));
             }

-            
+

             dateTime.Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear,
                 st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
             return dateTime.GetTicks();
             dateTime.Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear,
                 st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
             return dateTime.GetTicks();


@@ -1959,13 +1713,13 @@ bool wxIsWild( const wxString& pattern )
         switch (*pat++)
         {
         case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
         switch (*pat++)
         {
         case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):

-            return TRUE;
+            return true;

         case wxT('\\'):
             if (!*pat++)
         case wxT('\\'):
             if (!*pat++)

-                return FALSE;
+                return false;

         }
     }
         }
     }

-    return FALSE;
+    return false;

 }
 
 /*
 }
 
 /*


@@ -1997,7 +1751,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
         {
                 /* Never match so that hidden Unix files
                  * are never found. */
         {
                 /* Never match so that hidden Unix files
                  * are never found. */

-                return FALSE;
+                return false;

         }
 
         for (;;)
         }
 
         for (;;)


@@ -2014,7 +1768,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
                 {
                         m++;
                         if (!*n++)
                 {
                         m++;
                         if (!*n++)

-                        return FALSE;
+                        return false;

                 }
                 else
                 {
                 }
                 else
                 {


@@ -2023,7 +1777,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
                                 m++;
                                 /* Quoting "nothing" is a bad thing */
                                 if (!*m)
                                 m++;
                                 /* Quoting "nothing" is a bad thing */
                                 if (!*m)

-                                return FALSE;
+                                return false;

                         }
                         if (!*m)
                         {
                         }
                         if (!*m)
                         {


@@ -2033,9 +1787,9 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
                                 * match
                                 */
                                 if (!*n)
                                 * match
                                 */
                                 if (!*n)

-                                return TRUE;
+                                return true;

                                 if (just)
                                 if (just)

-                                return TRUE;
+                                return true;

                                 just = 0;
                                 goto not_matched;
                         }
                                 just = 0;
                                 goto not_matched;
                         }


@@ -2067,7 +1821,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
                                 * impossible to match it
                                 */
                                 if (!*n)
                                 * impossible to match it
                                 */
                                 if (!*n)

-                                return FALSE;
+                                return false;

                                 if (mp)
                                 {
                                         m = mp;
                                 if (mp)
                                 {
                                         m = mp;


@@ -2089,7 +1843,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
                                         count = acount;
                                 }
                                 else
                                         count = acount;
                                 }
                                 else

-                                return FALSE;
+                                return false;

                         }
                 }
         }
                         }
                 }
         }