Handle hot spots in wxImage::Rotate90().

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index b072f52667cab142bf281d2f0b44b321f1290dec..4dd3e7a48686120137bdde2f8bda49ba8b88ff1c 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -56,7 +56,7 @@
 #endif
 
 #if defined(__WXMAC__)
 #endif
 
 #if defined(__WXMAC__)

-    #include  "wx/mac/private.h"  // includes mac headers
+    #include  "wx/osx/private.h"  // includes mac headers

 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__


@@ -64,11 +64,13 @@
     #include "wx/msw/mslu.h"
 
     // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
     #include "wx/msw/mslu.h"
 
     // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()

+    // and for cygwin_conv_path()

     //
     // note that it must be included after <windows.h>
     #ifdef __GNUWIN32__
         #ifdef __CYGWIN__
             #include <sys/cygwin.h>
     //
     // note that it must be included after <windows.h>
     #ifdef __GNUWIN32__
         #ifdef __CYGWIN__
             #include <sys/cygwin.h>

+            #include <cygwin/version.h>

         #endif
     #endif // __GNUWIN32__
 
         #endif
     #endif // __GNUWIN32__
 


@@ -96,16 +98,17 @@
     #define _MAXPATHLEN 1024
 #endif
 
     #define _MAXPATHLEN 1024
 #endif
 

-#ifdef __WXMAC__
-#    include "MoreFilesX.h"
+#ifndef INVALID_FILE_ATTRIBUTES
+    #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)

 #endif
 
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
 
 #endif
 
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
 

-// MT-FIXME: get rid of this horror and all code using it
+#if WXWIN_COMPATIBILITY_2_8

 static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];

+#endif

 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //
 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //


@@ -115,13 +118,6 @@ static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 const int wxInvalidOffset = -1;
 #endif
 
 const int wxInvalidOffset = -1;
 #endif
 

-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// translate the filenames before passing them to OS functions
-#define OS_FILENAME(s) (s.fn_str())
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -137,7 +133,7 @@ const int wxInvalidOffset = -1;
 // regardless of the mode parameter. This hack works around the problem by
 // setting the mode with _wchmod.
 //
 // regardless of the mode parameter. This hack works around the problem by
 // setting the mode with _wchmod.
 //

-int wxCRT_Open(const wchar_t *pathname, int flags, mode_t mode)
+int wxCRT_OpenW(const wchar_t *pathname, int flags, mode_t mode)

 {
     int moreflags = 0;
 
 {
     int moreflags = 0;
 


@@ -293,9 +289,10 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) const
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// miscellaneous global functions (TOFIX!)
+// miscellaneous global functions

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_8

 static inline wxChar* MYcopystring(const wxString& s)
 {
     wxChar* copy = new wxChar[s.length() + 1];
 static inline wxChar* MYcopystring(const wxString& s)
 {
     wxChar* copy = new wxChar[s.length() + 1];


@@ -308,35 +305,13 @@ static inline CharType* MYcopystring(const CharType* s)
     CharType* copy = new CharType[wxStrlen(s) + 1];
     return wxStrcpy(copy, s);
 }
     CharType* copy = new CharType[wxStrlen(s) + 1];
     return wxStrcpy(copy, s);
 }

+#endif

 
 
 bool
 wxFileExists (const wxString& filename)
 {
 
 
 bool
 wxFileExists (const wxString& filename)
 {

-#if defined(__WXPALMOS__)
-    return false;
-#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
-    // we must use GetFileAttributes() instead of the ANSI C functions because
-    // it can cope with network (UNC) paths unlike them
-    DWORD ret = ::GetFileAttributes(filename.fn_str());
-
-    return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
-#else // !__WIN32__
-    #ifndef S_ISREG
-        #define S_ISREG(mode) ((mode) & S_IFREG)
-    #endif
-    wxStructStat st;
-#ifndef wxNEED_WX_UNISTD_H
-    return (wxStat( filename.fn_str() , &st) == 0 && S_ISREG(st.st_mode))
-#ifdef __OS2__
-      || (errno == EACCES) // if access is denied something with that name
-                            // exists and is opened in exclusive mode.
-#endif
-      ;
-#else
-    return wxStat( filename , &st) == 0 && S_ISREG(st.st_mode);
-#endif
-#endif // __WIN32__/!__WIN32__
+    return wxFileName::FileExists(filename);

 }
 
 bool
 }
 
 bool


@@ -344,20 +319,9 @@ wxIsAbsolutePath (const wxString& filename)
 {
     if (!filename.empty())
     {
 {
     if (!filename.empty())
     {

-#if defined(__WXMAC__) && !defined(__DARWIN__)
-        // Classic or Carbon CodeWarrior like
-        // Carbon with Apple DevTools is Unix like
-
-        // 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 ;
-#else

         // Unix like or Windows
         if (filename[0] == wxT('/'))
             return true;
         // Unix like or Windows
         if (filename[0] == wxT('/'))
             return true;

-#endif

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


@@ -371,6 +335,7 @@ wxIsAbsolutePath (const wxString& filename)
     return false ;
 }
 
     return false ;
 }
 

+#if WXWIN_COMPATIBILITY_2_8

 /*
  * Strip off any extension (dot something) from end of file,
  * IF one exists. Inserts zero into buffer.
 /*
  * Strip off any extension (dot something) from end of file,
  * IF one exists. Inserts zero into buffer.


@@ -398,27 +363,16 @@ void wxStripExtension(wchar_t *buffer) { wxDoStripExtension(buffer); }
 
 void wxStripExtension(wxString& buffer)
 {
 
 void wxStripExtension(wxString& buffer)
 {

-    //RN:  Be careful about the handling the case where
-    //buffer.length() == 0
-    for(size_t i = buffer.length() - 1; i != wxString::npos; --i)
-    {
-        if (buffer.GetChar(i) == wxT('.'))
-        {
-          buffer = buffer.Left(i);
-          break;
-        }
-    }
+   buffer = wxFileName::StripExtension(buffer);

 }
 
 // Destructive removal of /./ and /../ stuff
 template<typename CharType>
 static CharType *wxDoRealPath (CharType *path)
 {
 }
 
 // Destructive removal of /./ and /../ stuff
 template<typename CharType>
 static CharType *wxDoRealPath (CharType *path)
 {

+  static const CharType SEP = wxFILE_SEP_PATH;

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-  static const CharType SEP = wxT('\\');

   wxUnix2DosFilename(path);
   wxUnix2DosFilename(path);

-#else
-  static const CharType SEP = wxT('/');

 #endif
   if (path[0] && path[1]) {
     /* MATTHEW: special case "/./x" */
 #endif
   if (path[0] && path[1]) {
     /* MATTHEW: special case "/./x" */


@@ -491,7 +445,7 @@ wxString wxRealPath(const wxString& path)
 wxChar *wxCopyAbsolutePath(const wxString& filename)
 {
     if (filename.empty())
 wxChar *wxCopyAbsolutePath(const wxString& filename)
 {
     if (filename.empty())

-        return (wxChar *) NULL;
+        return NULL;

 
     if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename)))
     {
 
     if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename)))
     {


@@ -550,15 +504,15 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
     trimchars[2] = wxT('\t');
     trimchars[3] = 0;
 
     trimchars[2] = wxT('\t');
     trimchars[3] = 0;
 

+    static const CharType SEP = wxFILE_SEP_PATH;

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-    const CharType     SEP = wxT('\\');
-#else
-    const CharType     SEP = wxT('/');
+    //wxUnix2DosFilename(path);

 #endif
 #endif

+

     buf[0] = wxT('\0');
     if (name.empty())
         return buf;
     buf[0] = wxT('\0');
     if (name.empty())
         return buf;

-    nm = MYcopystring((const CharType*)name.c_str()); // Make a scratch copy
+    nm = ::MYcopystring(static_cast<const CharType*>(name.c_str())); // Make a scratch copy

     CharType *nm_tmp = nm;
 
     /* Skip leading whitespace and cr */
     CharType *nm_tmp = nm;
 
     /* Skip leading whitespace and cr */


@@ -724,7 +678,7 @@ wxContractPath (const wxString& filename,
   static wxChar dest[_MAXPATHLEN];
 
   if (filename.empty())
   static wxChar dest[_MAXPATHLEN];
 
   if (filename.empty())

-    return (wxChar *) NULL;
+    return NULL;

 
   wxStrcpy (dest, filename);
 #ifdef __WXMSW__
 
   wxStrcpy (dest, filename);
 #ifdef __WXMSW__


@@ -768,6 +722,8 @@ wxContractPath (const wxString& filename,
   return dest;
 }
 
   return dest;
 }
 

+#endif // #if WXWIN_COMPATIBILITY_2_8
+

 // Return just the filename, not the path (basename)
 wxChar *wxFileNameFromPath (wxChar *path)
 {
 // Return just the filename, not the path (basename)
 wxChar *wxFileNameFromPath (wxChar *path)
 {


@@ -808,22 +764,12 @@ wxPathOnly (wxChar *path)
         // Search backward for a backward or forward slash
         while (i > -1)
         {
         // Search backward for a backward or forward slash
         while (i > -1)
         {

-#if defined(__WXMAC__) && !defined(__DARWIN__)
-            // Classic or Carbon CodeWarrior like
-            // Carbon with Apple DevTools is Unix like
-            if (path[i] == wxT(':') )
-            {
-                buf[i] = 0;
-                return buf;
-            }
-#else

             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {
                 buf[i] = 0;
                 return buf;
             }
             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {
                 buf[i] = 0;
                 return buf;
             }

-#endif

 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {
 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {


@@ -845,7 +791,7 @@ wxPathOnly (wxChar *path)
         }
 #endif
     }
         }
 #endif
     }

-    return (wxChar *) NULL;
+    return NULL;

 }
 
 // Return just the directory, or NULL if no directory
 }
 
 // Return just the directory, or NULL if no directory


@@ -864,15 +810,6 @@ wxString wxPathOnly (const wxString& path)
         // Search backward for a backward or forward slash
         while (i > -1)
         {
         // Search backward for a backward or forward slash
         while (i > -1)
         {

-#if defined(__WXMAC__) && !defined(__DARWIN__)
-            // Classic or Carbon CodeWarrior like
-            // Carbon with Apple DevTools is Unix like
-            if (path[i] == wxT(':') )
-            {
-                buf[i] = 0;
-                return wxString(buf);
-            }
-#else

             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {
             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {


@@ -882,7 +819,6 @@ wxString wxPathOnly (const wxString& path)
                 buf[i] = 0;
                 return wxString(buf);
             }
                 buf[i] = 0;
                 return wxString(buf);
             }

-#endif

 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {
 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {


@@ -911,13 +847,9 @@ wxString wxPathOnly (const wxString& path)
 // and back again - or we get nasty problems with delimiters.
 // Also, convert to lower case, since case is significant in UNIX.
 
 // and back again - or we get nasty problems with delimiters.
 // Also, convert to lower case, since case is significant in UNIX.
 

-#if defined(__WXMAC__)
+#if defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)

 
 

-#if TARGET_API_MAC_OSX

 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 #define kDefaultPathStyle kCFURLPOSIXPathStyle

-#else
-#define kDefaultPathStyle kCFURLHFSPathStyle
-#endif

 
 wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
 {
 
 wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
 {


@@ -935,13 +867,13 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
     CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
     CFRelease( cfString );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
     CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
     CFRelease( cfString );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);

-    return wxMacCFStringHolder(cfMutableString).AsString();
+    return wxCFStringRef(cfMutableString).AsString();

 }
 
 OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
 {
     OSStatus err = noErr ;
 }
 
 OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
 {
     OSStatus err = noErr ;

-    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxMacCFStringHolder(path));
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(path));

     CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
     CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
     CFRelease( cfMutableString );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
     CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
     CFRelease( cfMutableString );


@@ -966,7 +898,7 @@ wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )
     CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
     CFRelease( cfname );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
     CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
     CFRelease( cfname );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);

-    return wxMacCFStringHolder(cfMutableString).AsString() ;
+    return wxCFStringRef(cfMutableString).AsString() ;

 }
 
 #ifndef __LP64__
 }
 
 #ifndef __LP64__


@@ -983,23 +915,27 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
 
 void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
 {
 
 void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
 {

-    OSStatus err = noErr ;
-    FSRef fsRef ;
-    wxMacPathToFSRef( path , &fsRef ) ;
-    err = FSRefMakeFSSpec( &fsRef , spec ) ;
+    OSStatus err = noErr;
+    FSRef fsRef;
+    wxMacPathToFSRef( path , &fsRef );
+    err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
+    verify_noerr( err );

 }
 #endif
 
 #endif // __WXMAC__
 
 }
 #endif
 
 #endif // __WXMAC__
 

+
+#if WXWIN_COMPATIBILITY_2_8
+

 template<typename T>
 static void wxDoDos2UnixFilename(T *s)
 {
   if (s)
     while (*s)
       {
 template<typename T>
 static void wxDoDos2UnixFilename(T *s)
 {
   if (s)
     while (*s)
       {

-        if (*s == _T('\\'))
-          *s = _T('/');
+        if (*s == wxT('\\'))
+          *s = wxT('/');

 #ifdef __WXMSW__
         else
           *s = wxTolower(*s);        // Case INDEPENDENT
 #ifdef __WXMSW__
         else
           *s = wxTolower(*s);        // Case INDEPENDENT


@@ -1034,6 +970,8 @@ wxDoUnix2DosFilename(T *WXUNUSED(s) )
 void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); }
 void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); }
 
 void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); }
 void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); }
 

+#endif // #if WXWIN_COMPATIBILITY_2_8
+

 // Concatenate two files to form third
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 // Concatenate two files to form third
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)


@@ -1126,7 +1064,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
     // instead of our code if available
     //
     // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
     // instead of our code if available
     //
     // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite

-    if ( !::CopyFile(file1.fn_str(), file2.fn_str(), !overwrite) )
+    if ( !::CopyFile(file1.t_str(), file2.t_str(), !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());


@@ -1143,7 +1081,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
 
     wxStructStat fbuf;
     // get permissions of file1
 
     wxStructStat fbuf;
     // get permissions of file1

-    if ( wxStat( file1.c_str(), &fbuf) != 0 )
+    if ( wxStat( file1, &fbuf) != 0 )

     {
         // the file probably doesn't exist or we haven't the rights to read
         // from it anyhow
     {
         // the file probably doesn't exist or we haven't the rights to read
         // from it anyhow


@@ -1213,7 +1151,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
 #if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
     // no chmod in VA.  Should be some permission API for HPFS386 partitions
     // however
 #if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
     // no chmod in VA.  Should be some permission API for HPFS386 partitions
     // however

-    if ( chmod(OS_FILENAME(file2), fbuf.st_mode) != 0 )
+    if ( chmod(file2.fn_str(), fbuf.st_mode) != 0 )

     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());
     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());


@@ -1278,7 +1216,7 @@ bool wxRemoveFile(const wxString& file)
     int res = 1;
     // TODO with VFSFileDelete()
 #else
     int res = 1;
     // TODO with VFSFileDelete()
 #else

-    int res = unlink(OS_FILENAME(file));
+    int res = unlink(file.fn_str());

 #endif
 
     return res == 0;
 #endif
 
     return res == 0;


@@ -1288,14 +1226,16 @@ bool wxMkdir(const wxString& dir, int perm)
 {
 #if defined(__WXPALMOS__)
     return false;
 {
 #if defined(__WXPALMOS__)
     return false;

-#elif defined(__WXMAC__) && !defined(__UNIX__)
-    return (mkdir(dir.fn_str() , 0 ) == 0);
-#else // !Mac
-    const wxChar *dirname = dir.c_str();
+#else
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    if ( mkdir(dir.fn_str(), 0) != 0 )

 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler
 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler

-#if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
+#elif (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || \
+      (defined(__GNUWIN32__) && !defined(__MINGW32__)) ||                \
+      defined(__WINE__) || defined(__WXMICROWIN__)
+    const wxChar *dirname = dir.c_str();

   #if defined(MSVCRT)
     wxUnusedVar(perm);
     if ( mkdir(wxFNCONV(dirname)) != 0 )
   #if defined(MSVCRT)
     wxUnusedVar(perm);
     if ( mkdir(wxFNCONV(dirname)) != 0 )


@@ -1304,8 +1244,9 @@ bool wxMkdir(const wxString& dir, int perm)
   #endif
 #elif defined(__OS2__)
     wxUnusedVar(perm);
   #endif
 #elif defined(__OS2__)
     wxUnusedVar(perm);

-    if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
+    if (::DosCreateDir(dir.c_str(), NULL) != 0) // enhance for EAB's??

 #elif defined(__DOS__)
 #elif defined(__DOS__)

+    const wxChar *dirname = dir.c_str();

   #if defined(__WATCOMC__)
     (void)perm;
     if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
   #if defined(__WATCOMC__)
     (void)perm;
     if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )


@@ -1316,91 +1257,53 @@ bool wxMkdir(const wxString& dir, int perm)
   #endif
 #else  // !MSW, !DOS and !OS/2 VAC++
     wxUnusedVar(perm);
   #endif
 #else  // !MSW, !DOS and !OS/2 VAC++
     wxUnusedVar(perm);

-#ifdef __WXWINCE__
-    if ( !CreateDirectory(dirname, NULL) )
-#else
+  #ifdef __WXWINCE__
+    if ( CreateDirectory(dir.fn_str(), NULL) == 0 )
+  #else

     if ( wxMkDir(dir.fn_str()) != 0 )
     if ( wxMkDir(dir.fn_str()) != 0 )

-#endif
+  #endif

 #endif // !MSW/MSW
     {
 #endif // !MSW/MSW
     {

-        wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
-
+        wxLogSysError(_("Directory '%s' couldn't be created"), dir);

         return false;
     }
 
     return true;
         return false;
     }
 
     return true;

-#endif // Mac/!Mac
+#endif // PALMOS/!PALMOS

 }
 
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #if defined(__VMS__)
     return false; //to be changed since rmdir exists in VMS7.x
 }
 
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #if defined(__VMS__)
     return false; //to be changed since rmdir exists in VMS7.x

-#elif defined(__OS2__)
-    return (::DosDeleteDir(dir.c_str()) == 0);
-#elif defined(__WXWINCE__)
-    return (RemoveDirectory(dir) != 0);

 #elif defined(__WXPALMOS__)
     // TODO with VFSFileRename()
     return false;
 #else
 #elif defined(__WXPALMOS__)
     // TODO with VFSFileRename()
     return false;
 #else

-    return (wxRmDir(OS_FILENAME(dir)) == 0);
-#endif
+  #if defined(__OS2__)
+    if ( ::DosDeleteDir(dir.c_str()) != 0 )
+  #elif defined(__WXWINCE__)
+    if ( RemoveDirectory(dir.fn_str()) == 0 )
+  #else
+    if ( wxRmDir(dir.fn_str()) != 0 )
+  #endif
+    {
+        wxLogSysError(_("Directory '%s' couldn't be deleted"), dir);
+        return false;
+    }
+
+    return true;
+#endif // PALMOS/!PALMOS

 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)
 bool wxDirExists(const wxString& pathName)
 {
 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)
 bool wxDirExists(const wxString& pathName)
 {

-    wxString strPath(pathName);
-
-#if defined(__WINDOWS__) || defined(__OS2__)
-    // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
-    // so remove all trailing backslashes from the path - but don't do this for
-    // the paths "d:\" (which are different from "d:") nor for just "\"
-    while ( wxEndsWithPathSeparator(strPath) )
-    {
-        size_t len = strPath.length();
-        if ( len == 1 || (len == 3 && strPath[len - 2] == _T(':')) )
-            break;
-
-        strPath.Truncate(len - 1);
-    }
-#endif // __WINDOWS__
-
-#ifdef __OS2__
-    // OS/2 can't handle "d:", it wants either "d:\" or "d:."
-    if (strPath.length() == 2 && strPath[1u] == _T(':'))
-        strPath << _T('.');
-#endif
-
-#if defined(__WXPALMOS__)
-    return false;
-#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
-    // stat() can't cope with network paths
-    DWORD ret = ::GetFileAttributes(strPath.fn_str());
-
-    return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
-#elif defined(__OS2__)
-    FILESTATUS3 Info = {{0}};
-    APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,
-                                   (void*) &Info, sizeof(FILESTATUS3));
-
-    return ((rc == NO_ERROR) && (Info.attrFile & FILE_DIRECTORY)) ||
-      (rc == ERROR_SHARING_VIOLATION);
-    // If we got a sharing violation, there must be something with this name.
-#else // !__WIN32__
-
-    wxStructStat st;
-#ifndef __VISAGECPP__
-    return wxStat(strPath.c_str(), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR);
-#else
-    // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only
-    return wxStat(strPath.c_str(), &st) == 0 && (st.st_mode == S_IFDIR);
-#endif
-
-#endif // __WIN32__/!__WIN32__
+    return wxFileName::DirExists(pathName);

 }
 
 }
 

+#if WXWIN_COMPATIBILITY_2_8
+

 // Get a temporary filename, opening and closing the file.
 wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
 {
 // Get a temporary filename, opening and closing the file.
 wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
 {


@@ -1409,7 +1312,12 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
         return NULL;
 
     if ( buf )
         return NULL;
 
     if ( buf )

+#ifdef _PACC_VER
+        // work around the PalmOS pacc compiler bug
+        wxStrcpy(buf, filename.data());
+#else

         wxStrcpy(buf, filename);
         wxStrcpy(buf, filename);

+#endif

     else
         buf = MYcopystring(filename);
 
     else
         buf = MYcopystring(filename);
 


@@ -1430,6 +1338,8 @@ bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 #endif // wxUSE_FILE/!wxUSE_FILE
 }
 
 #endif // wxUSE_FILE/!wxUSE_FILE
 }
 

+#endif // #if WXWIN_COMPATIBILITY_2_8
+

 // Get first file name matching given wild card.
 
 static wxDir *gs_dir = NULL;
 // Get first file name matching given wild card.
 
 static wxDir *gs_dir = NULL;


@@ -1437,14 +1347,13 @@ static wxString gs_dirPath;
 
 wxString wxFindFirstFile(const wxString& spec, int flags)
 {
 
 wxString wxFindFirstFile(const wxString& spec, int flags)
 {

-    wxSplitPath(spec, &gs_dirPath, NULL, NULL);
+    wxFileName::SplitPath(spec, &gs_dirPath, NULL, NULL);

     if ( gs_dirPath.empty() )
         gs_dirPath = wxT(".");
     if ( !wxEndsWithPathSeparator(gs_dirPath ) )
         gs_dirPath << wxFILE_SEP_PATH;
 
     if ( gs_dirPath.empty() )
         gs_dirPath = wxT(".");
     if ( !wxEndsWithPathSeparator(gs_dirPath ) )
         gs_dirPath << wxFILE_SEP_PATH;
 

-    if (gs_dir)
-        delete gs_dir;
+    delete gs_dir; // can be NULL, this is ok

     gs_dir = new wxDir(gs_dirPath);
 
     if ( !gs_dir->IsOpened() )
     gs_dir = new wxDir(gs_dirPath);
 
     if ( !gs_dir->IsOpened() )


@@ -1474,7 +1383,7 @@ wxString wxFindFirstFile(const wxString& spec, int flags)
 
 wxString wxFindNextFile()
 {
 
 wxString wxFindNextFile()
 {

-    wxASSERT_MSG( gs_dir, wxT("You must call wxFindFirstFile before!") );
+    wxCHECK_MSG( gs_dir, "", "You must call wxFindFirstFile before!" );

 
     wxString result;
     gs_dir->GetNext(&result);
 
     wxString result;
     gs_dir->GetNext(&result);


@@ -1500,11 +1409,11 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
 {
 #if defined(__WXPALMOS__)
     // TODO
 {
 #if defined(__WXPALMOS__)
     // TODO

-    if(buf && sz>0) buf[0] = _T('\0');
+    if(buf && sz>0) buf[0] = wxT('\0');

     return buf;
 #elif defined(__WXWINCE__)
     // TODO
     return buf;
 #elif defined(__WXWINCE__)
     // TODO

-    if(buf && sz>0) buf[0] = _T('\0');
+    if(buf && sz>0) buf[0] = wxT('\0');

     return buf;
 #else
     if ( !buf )
     return buf;
 #else
     if ( !buf )


@@ -1542,16 +1451,6 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
     {
     #if defined(_MSC_VER) || defined(__MINGW32__)
         ok = _getcwd(cbuf, sz) != NULL;
     {
     #if defined(_MSC_VER) || defined(__MINGW32__)
         ok = _getcwd(cbuf, sz) != NULL;

-    #elif defined(__WXMAC__) && !defined(__DARWIN__)
-        char lbuf[1024] ;
-        if ( getcwd( lbuf , sizeof( lbuf ) ) )
-        {
-            wxString res( lbuf , *wxConvCurrent ) ;
-            wxStrcpy( buf , res ) ;
-            ok = true;
-        }
-        else
-            ok = false ;

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


@@ -1562,7 +1461,7 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
         {
             sz -= 3;
             rc = ::DosQueryCurrentDir( 0 // current drive
         {
             sz -= 3;
             rc = ::DosQueryCurrentDir( 0 // current drive

-                                      ,cbuf + 3
+                                      ,(PBYTE)cbuf + 3

                                       ,(PULONG)&sz
                                      );
             cbuf[0] = char('A' + (ulDriveNum - 1));
                                       ,(PULONG)&sz
                                      );
             cbuf[0] = char('A' + (ulDriveNum - 1));


@@ -1574,7 +1473,7 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
         ok = getcwd(cbuf, sz) != NULL;
     #endif // platform
 
         ok = getcwd(cbuf, sz) != NULL;
     #endif // platform
 

-    #if wxUSE_UNICODE && !(defined(__WXMAC__) && !defined(__DARWIN__))
+    #if wxUSE_UNICODE

         // finally convert the result to Unicode if needed
         wxConvFile.MB2WC(buf, cbuf, sz);
     #endif // wxUSE_UNICODE
         // finally convert the result to Unicode if needed
         wxConvFile.MB2WC(buf, cbuf, sz);
     #endif // wxUSE_UNICODE


@@ -1588,7 +1487,7 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
         //     sense at all to me - empty string is a better error indicator
         //     (NULL might be even better but I'm afraid this could lead to
         //     problems with the old code assuming the return is never NULL)
         //     sense at all to me - empty string is a better error indicator
         //     (NULL might be even better but I'm afraid this could lead to
         //     problems with the old code assuming the return is never NULL)

-        buf[0] = _T('\0');
+        buf[0] = wxT('\0');

     }
     else // ok, but we might need to massage the path into the right format
     {
     }
     else // ok, but we might need to massage the path into the right format
     {


@@ -1608,11 +1507,19 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
         // another example of DOS/Unix mix (Cygwin)
         wxString pathUnix = buf;
 #if wxUSE_UNICODE
         // another example of DOS/Unix mix (Cygwin)
         wxString pathUnix = buf;
 #if wxUSE_UNICODE

+    #if CYGWIN_VERSION_DLL_MAJOR >= 1007
+        cygwin_conv_path(CCP_POSIX_TO_WIN_W, pathUnix.mb_str(wxConvFile), buf, sz);
+    #else

         char bufA[_MAXPATHLEN];
         cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA);
         wxConvFile.MB2WC(buf, bufA, sz);
         char bufA[_MAXPATHLEN];
         cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA);
         wxConvFile.MB2WC(buf, bufA, sz);

+    #endif

 #else
 #else

+    #if CYGWIN_VERSION_DLL_MAJOR >= 1007
+        cygwin_conv_path(CCP_POSIX_TO_WIN_A, pathUnix, buf, sz);
+    #else

         cygwin_conv_to_full_win32_path(pathUnix, buf);
         cygwin_conv_to_full_win32_path(pathUnix, buf);

+    #endif

 #endif // wxUSE_UNICODE
 #endif // __CYGWIN__
     }
 #endif // wxUSE_UNICODE
 #endif // __CYGWIN__
     }


@@ -1646,7 +1553,7 @@ bool wxSetWorkingDirectory(const wxString& d)
 #if defined(__OS2__)
     if (d[1] == ':')
     {
 #if defined(__OS2__)
     if (d[1] == ':')
     {

-        ::DosSetDefaultDisk(wxToupper(d[0]) - _T('A') + 1);
+        ::DosSetDefaultDisk(wxToupper(d[0]) - wxT('A') + 1);

     // do not call DosSetCurrentDir when just changing drive,
     // since it requires e.g. "d:." instead of "d:"!
     if (d.length() == 2)
     // do not call DosSetCurrentDir when just changing drive,
     // since it requires e.g. "d:." instead of "d:"!
     if (d.length() == 2)


@@ -1702,8 +1609,8 @@ wxString wxGetOSDirectory()
     wxChar buf[256];
     GetWindowsDirectory(buf, 256);
     return wxString(buf);
     wxChar buf[256];
     GetWindowsDirectory(buf, 256);
     return wxString(buf);

-#elif defined(__WXMAC__)
-    return wxMacFindFolder(kOnSystemDisk, 'macs', false);
+#elif defined(__WXMAC__) && wxOSX_USE_CARBON
+    return wxMacFindFolderNoSeparator(kOnSystemDisk, 'macs', false);

 #else
     return wxEmptyString;
 #endif
 #else
     return wxEmptyString;
 #endif


@@ -1719,7 +1626,7 @@ bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& sz
 {
     // we assume that it's not empty
     wxCHECK_MSG( !szFile.empty(), false,
 {
     // we assume that it's not empty
     wxCHECK_MSG( !szFile.empty(), false,

-                 _T("empty file name in wxFindFileInPath"));
+                 wxT("empty file name in wxFindFileInPath"));

 
     // skip path separator in the beginning of the file name if present
     wxString szFile2;
 
     // skip path separator in the beginning of the file name if present
     wxString szFile2;


@@ -1747,17 +1654,19 @@ bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& sz
     return false;
 }
 
     return false;
 }
 

-void WXDLLEXPORT wxSplitPath(const wxString& fileName,
+#if WXWIN_COMPATIBILITY_2_8
+void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,

                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt)
 {
     wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
 }
                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt)
 {
     wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
 }

+#endif  // #if WXWIN_COMPATIBILITY_2_8

 
 #if wxUSE_DATETIME
 
 
 #if wxUSE_DATETIME
 

-time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)

 {
     wxDateTime mtime;
     if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
 {
     wxDateTime mtime;
     if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )


@@ -1773,7 +1682,7 @@ time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
 // Returns 0 if none or if there's a problem.
 // filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"
 
 // Returns 0 if none or if there's a problem.
 // filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"
 

-int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
+int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,

                                            wxArrayString& descriptions,
                                            wxArrayString& filters)
 {
                                            wxArrayString& descriptions,
                                            wxArrayString& filters)
 {


@@ -1798,7 +1707,7 @@ int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
             }
             else
             {
             }
             else
             {

-                wxFAIL_MSG( _T("missing '|' in the wildcard string!") );
+                wxFAIL_MSG( wxT("missing '|' in the wildcard string!") );

             }
 
             break;
             }
 
             break;


@@ -1849,13 +1758,13 @@ int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
                 {
                     wxString before = descriptions[k].Left(pos);
                     wxString after = descriptions[k].Mid(pos+filters[k].Len());
                 {
                     wxString before = descriptions[k].Left(pos);
                     wxString after = descriptions[k].Mid(pos+filters[k].Len());

-                    pos = before.Find(_T('('),true);
-                    if (pos>before.Find(_T(')'),true))
+                    pos = before.Find(wxT('('),true);
+                    if (pos>before.Find(wxT(')'),true))

                     {
                         before = before.Left(pos+1);
                         before << filters[k];
                     {
                         before = before.Left(pos+1);
                         before << filters[k];

-                        pos = after.Find(_T(')'));
-                        int pos1 = after.Find(_T('('));
+                        pos = after.Find(wxT(')'));
+                        int pos1 = after.Find(wxT('('));

                         if (pos != wxNOT_FOUND && (pos<pos1 || pos1==wxNOT_FOUND))
                         {
                             before << after.Mid(pos);
                         if (pos != wxNOT_FOUND && (pos<pos1 || pos1==wxNOT_FOUND))
                         {
                             before << after.Mid(pos);


@@ -1886,22 +1795,32 @@ static bool wxCheckWin32Permission(const wxString& path, DWORD access)
     // quoting the MSDN: "To obtain a handle to a directory, call the
     // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
     // doesn't work under Win9x/ME but then it's not needed there anyhow
     // quoting the MSDN: "To obtain a handle to a directory, call the
     // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
     // doesn't work under Win9x/ME but then it's not needed there anyhow

-    bool isdir = wxDirExists(path);
-    if ( isdir && wxGetOsVersion() == wxOS_WINDOWS_9X )
+    const DWORD dwAttr = ::GetFileAttributes(path.fn_str());
+    if ( dwAttr == INVALID_FILE_ATTRIBUTES )
+    {
+        // file probably doesn't exist at all
+        return false;
+    }
+
+    if ( wxGetOsVersion() == wxOS_WINDOWS_9X )

     {
         // FAT directories always allow all access, even if they have the
     {
         // FAT directories always allow all access, even if they have the

-        // readonly flag set
-        return true;
+        // readonly flag set, and FAT files can only be read-only
+        return (dwAttr & FILE_ATTRIBUTE_DIRECTORY) ||
+                    (access != GENERIC_WRITE ||
+                        !(dwAttr & FILE_ATTRIBUTE_READONLY));

     }
 
     HANDLE h = ::CreateFile
                  (
     }
 
     HANDLE h = ::CreateFile
                  (

-                    path.wx_str(),
+                    path.t_str(),

                     access,
                     FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                     NULL,
                     OPEN_EXISTING,
                     access,
                     FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                     NULL,
                     OPEN_EXISTING,

-                    isdir ? FILE_FLAG_BACKUP_SEMANTICS : 0,
+                    dwAttr & FILE_ATTRIBUTE_DIRECTORY
+                        ? FILE_FLAG_BACKUP_SEMANTICS
+                        : 0,

                     NULL
                  );
     if ( h != INVALID_HANDLE_VALUE )
                     NULL
                  );
     if ( h != INVALID_HANDLE_VALUE )


@@ -1915,7 +1834,7 @@ bool wxIsWritable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links

-    return wxAccess(path.fn_str(), W_OK) == 0;
+    return wxAccess(path.c_str(), W_OK) == 0;

 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_WRITE);
 #else
 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_WRITE);
 #else


@@ -1929,7 +1848,7 @@ bool wxIsReadable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links

-    return wxAccess(path.fn_str(), R_OK) == 0;
+    return wxAccess(path.c_str(), R_OK) == 0;

 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_READ);
 #else
 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_READ);
 #else


@@ -1943,7 +1862,7 @@ bool wxIsExecutable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links

-    return wxAccess(path.fn_str(), X_OK) == 0;
+    return wxAccess(path.c_str(), X_OK) == 0;

 #elif defined( __WINDOWS__ )
    return wxCheckWin32Permission(path, GENERIC_EXECUTE);
 #else
 #elif defined( __WINDOWS__ )
    return wxCheckWin32Permission(path, GENERIC_EXECUTE);
 #else