cvs to svn

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index df91e1cb4e3f9a4417237f0e9af09cdefb0f7bf9..7e806a16cc5822eb37f6ce6ce7ae716d0393e4d0 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -24,13 +24,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/filefn.h"
+

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"

+    #include "wx/crt.h"

 #endif
 
 #endif
 

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

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


@@ -115,38 +118,60 @@ const int wxInvalidOffset = -1;
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-// we need to translate Mac filenames before passing them to OS functions
+// translate the filenames before passing them to OS functions

 #define OS_FILENAME(s) (s.fn_str())
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 #define OS_FILENAME(s) (s.fn_str())
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-#ifdef wxNEED_WX_UNISTD_H
+// ----------------------------------------------------------------------------
+// wrappers around standard POSIX functions
+// ----------------------------------------------------------------------------

 
 

-WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
-{
-    return stat( wxConvFile.cWX2MB( file_name ), buf );
-}
+#if wxUSE_UNICODE && defined __BORLANDC__ \
+    && __BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551

 
 

-WXDLLEXPORT int wxAccess( const wxChar *pathname, int mode )
+// BCC 5.5 and 5.5.1 have a bug in _wopen where files are created read only
+// 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)

 {
 {

-    return access( wxConvFile.cWX2MB( pathname ), mode );
-}
+    int moreflags = 0;

 
 

-WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode )
-{
-    return open( wxConvFile.cWX2MB( pathname ), flags, mode );
+    // we only want to fix the mode when the file is actually created, so
+    // when creating first try doing it O_EXCL so we can tell if the file
+    // was already there.
+    if ((flags & O_CREAT) && !(flags & O_EXCL) && (mode & wxS_IWUSR) != 0)
+        moreflags = O_EXCL;
+
+    int fd = _wopen(pathname, flags | moreflags, mode);
+
+    // the file was actually created and needs fixing
+    if (fd != -1 && (flags & O_CREAT) != 0 && (mode & wxS_IWUSR) != 0)
+    {
+        close(fd);
+        _wchmod(pathname, mode);
+        fd = _wopen(pathname, flags & ~(O_EXCL | O_CREAT));
+    }
+    // the open failed, but it may have been because the added O_EXCL stopped
+    // the opening of an existing file, so try again without.
+    else if (fd == -1 && moreflags != 0)
+    {
+        fd = _wopen(pathname, flags & ~O_CREAT);
+    }
+
+    return fd;

 }
 
 #endif
 }
 
 #endif

-   // wxNEED_WX_UNISTD_H

 
 // ----------------------------------------------------------------------------
 // wxPathList
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxPathList
 // ----------------------------------------------------------------------------
 

-void wxPathList::Add(const wxString& path)
+bool wxPathList::Add(const wxString& path)

 {
     // add a path separator to force wxFileName to interpret it always as a directory
     // (i.e. if we are called with '/home/user' we want to consider it a folder and
 {
     // add a path separator to force wxFileName to interpret it always as a directory
     // (i.e. if we are called with '/home/user' we want to consider it a folder and


@@ -154,11 +179,17 @@ void wxPathList::Add(const wxString& path)
     wxFileName fn(path + wxFileName::GetPathSeparator());
 
     // add only normalized relative/absolute paths
     wxFileName fn(path + wxFileName::GetPathSeparator());
 
     // add only normalized relative/absolute paths

-    fn.Normalize(wxPATH_NORM_DOTS|wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS);
+    // NB: we won't do wxPATH_NORM_DOTS in order to avoid problems when trying to
+    //     normalize paths which starts with ".." (which can be normalized only if
+    //     we use also wxPATH_NORM_ABSOLUTE - which we don't want to use).
+    if (!fn.Normalize(wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS))
+        return false;

 
     wxString toadd = fn.GetPath();
     if (Index(toadd) == wxNOT_FOUND)
         wxArrayString::Add(toadd);      // do not add duplicates
 
     wxString toadd = fn.GetPath();
     if (Index(toadd) == wxNOT_FOUND)
         wxArrayString::Add(toadd);      // do not add duplicates

+
+    return true;

 }
 
 void wxPathList::Add(const wxArrayString &arr)
 }
 
 void wxPathList::Add(const wxArrayString &arr)


@@ -197,21 +228,17 @@ void wxPathList::AddEnvList (const wxString& WXUNUSED_IN_WINCE(envVariable))
 // Given a full filename (with path), ensure that that file can
 // be accessed again USING FILENAME ONLY by adding the path
 // to the list if not already there.
 // Given a full filename (with path), ensure that that file can
 // be accessed again USING FILENAME ONLY by adding the path
 // to the list if not already there.

-void wxPathList::EnsureFileAccessible (const wxString& path)
+bool wxPathList::EnsureFileAccessible (const wxString& path)

 {
 {

-    wxString path_only(wxPathOnly(path));
-    if ( !path_only.empty() )
-    {
-        if ( Index(path_only) == wxNOT_FOUND )
-            Add(path_only);
-    }
+    return Add(wxPathOnly(path));

 }
 
 }
 

-// deprecated !
+#if WXWIN_COMPATIBILITY_2_6

 bool wxPathList::Member (const wxString& path) const
 {
     return Index(path) != wxNOT_FOUND;
 }
 bool wxPathList::Member (const wxString& path) const
 {
     return Index(path) != wxNOT_FOUND;
 }

+#endif

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


@@ -220,8 +247,13 @@ wxString wxPathList::FindValidPath (const wxString& file) const
     wxFileName fn(file);
     wxString strend;
 
     wxFileName fn(file);
     wxString strend;
 

-    // NB: normalize without making absolute !
-    fn.Normalize(wxPATH_NORM_DOTS|wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS);
+    // NB: normalize without making absolute otherwise calling this function with
+    //     e.g. "b/c.txt" would result in removing the directory 'b' and the for loop
+    //     below would only add to the paths of this list the 'c.txt' part when doing
+    //     the existence checks...
+    // NB: we don't use wxPATH_NORM_DOTS here, too (see wxPathList::Add for more info)
+    if (!fn.Normalize(wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS))
+        return wxEmptyString;

 
     wxASSERT_MSG(!fn.IsDir(), wxT("Cannot search for directories; only for files"));
     if (fn.IsAbsolute())
 
     wxASSERT_MSG(!fn.IsDir(), wxT("Cannot search for directories; only for files"));
     if (fn.IsAbsolute())


@@ -269,9 +301,10 @@ static inline wxChar* MYcopystring(const wxString& s)
     return wxStrcpy(copy, s.c_str());
 }
 
     return wxStrcpy(copy, s.c_str());
 }
 

-static inline wxChar* MYcopystring(const wxChar* s)
+template<typename CharType>
+static inline CharType* MYcopystring(const CharType* s)

 {
 {

-    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    CharType* copy = new CharType[wxStrlen(s) + 1];

     return wxStrcpy(copy, s);
 }
 
     return wxStrcpy(copy, s);
 }
 


@@ -284,7 +317,7 @@ wxFileExists (const wxString& filename)
 #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
 #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);
+    DWORD ret = ::GetFileAttributes(filename.fn_str());

 
     return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
 #else // !__WIN32__
 
     return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
 #else // !__WIN32__


@@ -343,7 +376,8 @@ wxIsAbsolutePath (const wxString& filename)
  *
  */
 
  *
  */
 

-void wxStripExtension(wxChar *buffer)
+template<typename T>
+static void wxDoStripExtension(T *buffer)

 {
     int len = wxStrlen(buffer);
     int i = len-1;
 {
     int len = wxStrlen(buffer);
     int i = len-1;


@@ -358,6 +392,9 @@ void wxStripExtension(wxChar *buffer)
     }
 }
 
     }
 }
 

+void wxStripExtension(char *buffer) { wxDoStripExtension(buffer); }
+void wxStripExtension(wchar_t *buffer) { wxDoStripExtension(buffer); }
+

 void wxStripExtension(wxString& buffer)
 {
     //RN:  Be careful about the handling the case where
 void wxStripExtension(wxString& buffer)
 {
     //RN:  Be careful about the handling the case where


@@ -373,17 +410,18 @@ void wxStripExtension(wxString& buffer)
 }
 
 // Destructive removal of /./ and /../ stuff
 }
 
 // Destructive removal of /./ and /../ stuff

-wxChar *wxRealPath (wxChar *path)
+template<typename CharType>
+static CharType *wxDoRealPath (CharType *path)

 {
 #ifdef __WXMSW__
 {
 #ifdef __WXMSW__

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

   wxUnix2DosFilename(path);
 #else
   wxUnix2DosFilename(path);
 #else

-  static const wxChar SEP = wxT('/');
+  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" */

-    wxChar *p;
+    CharType *p;

     if (path[2] == SEP && path[1] == wxT('.'))
       p = &path[0];
     else
     if (path[2] == SEP && path[1] == wxT('.'))
       p = &path[0];
     else


@@ -394,7 +432,7 @@ wxChar *wxRealPath (wxChar *path)
           {
             if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
               {
           {
             if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
               {

-                wxChar *q;
+                CharType *q;

                 for (q = p - 1; q >= path && *q != SEP; q--)
                 {
                     // Empty
                 for (q = p - 1; q >= path && *q != SEP; q--)
                 {
                     // Empty


@@ -428,6 +466,16 @@ wxChar *wxRealPath (wxChar *path)
   return path;
 }
 
   return path;
 }
 

+char *wxRealPath(char *path)
+{
+    return wxDoRealPath(path);
+}
+
+wchar_t *wxRealPath(wchar_t *path)
+{
+    return wxDoRealPath(path);
+}
+

 wxString wxRealPath(const wxString& path)
 {
     wxChar *buf1=MYcopystring(path);
 wxString wxRealPath(const wxString& path)
 {
     wxChar *buf1=MYcopystring(path);


@@ -485,38 +533,39 @@ wxChar *wxCopyAbsolutePath(const wxString& filename)
 
 /* input name in name, pathname output to buf. */
 
 
 /* input name in name, pathname output to buf. */
 

-wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
+template<typename CharType>
+static CharType *wxDoExpandPath(CharType *buf, const wxString& name)

 {
 {

-    register wxChar *d, *s, *nm;
-    wxChar          lnm[_MAXPATHLEN];
+    register CharType *d, *s, *nm;
+    CharType        lnm[_MAXPATHLEN];

     int             q;
 
     // Some compilers don't like this line.
     int             q;
 
     // Some compilers don't like this line.

-//    const wxChar    trimchars[] = wxT("\n \t");
+//    const CharType    trimchars[] = wxT("\n \t");

 
 

-    wxChar      trimchars[4];
+    CharType      trimchars[4];

     trimchars[0] = wxT('\n');
     trimchars[1] = wxT(' ');
     trimchars[2] = wxT('\t');
     trimchars[3] = 0;
 
 #ifdef __WXMSW__
     trimchars[0] = wxT('\n');
     trimchars[1] = wxT(' ');
     trimchars[2] = wxT('\t');
     trimchars[3] = 0;
 
 #ifdef __WXMSW__

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

 #else
 #else

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

 #endif
     buf[0] = wxT('\0');
 #endif
     buf[0] = wxT('\0');

-    if (name == NULL || *name == wxT('\0'))
+    if (name.empty())

         return buf;
         return buf;

-    nm = MYcopystring(name); // Make a scratch copy
-    wxChar *nm_tmp = nm;
+    nm = MYcopystring((const CharType*)name.c_str()); // Make a scratch copy
+    CharType *nm_tmp = nm;

 
     /* Skip leading whitespace and cr */
 
     /* Skip leading whitespace and cr */

-    while (wxStrchr((wxChar *)trimchars, *nm) != NULL)
+    while (wxStrchr(trimchars, *nm) != NULL)

         nm++;
     /* And strip off trailing whitespace and cr */
     s = nm + (q = wxStrlen(nm)) - 1;
         nm++;
     /* And strip off trailing whitespace and cr */
     s = nm + (q = wxStrlen(nm)) - 1;

-    while (q-- && wxStrchr((wxChar *)trimchars, *s) != NULL)
+    while (q-- && wxStrchr(trimchars, *s) != NULL)

         *s = wxT('\0');
 
     s = nm;
         *s = wxT('\0');
 
     s = nm;


@@ -564,9 +613,9 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
         if (*s++ == wxT('$'))
 #endif
         {
         if (*s++ == wxT('$'))
 #endif
         {

-            register wxChar  *start = d;
+            register CharType  *start = d;

             register int     braces = (*s == wxT('{') || *s == wxT('('));
             register int     braces = (*s == wxT('{') || *s == wxT('('));

-            register wxChar  *value;
+            register CharType  *value;

             while ((*d++ = *s) != 0)
                 if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
                     break;
             while ((*d++ = *s) != 0)
                 if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
                     break;


@@ -590,21 +639,22 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     }
 
     /* Expand ~ and ~user */
     }
 
     /* Expand ~ and ~user */

+    wxString homepath;

     nm = lnm;
     if (nm[0] == wxT('~') && !q)
     {
         /* prefix ~ */
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */
     nm = lnm;
     if (nm[0] == wxT('~') && !q)
     {
         /* prefix ~ */
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */

-        // FIXME: wxGetUserHome could return temporary storage in Unicode mode
-            if ((s = WXSTRINGCAST wxGetUserHome(wxEmptyString)) != NULL) {
+            homepath = wxGetUserHome(wxEmptyString);
+            if (!homepath.empty()) {
+                s = (CharType*)(const CharType*)homepath.c_str();

                 if (*++nm)
                     nm++;
             }
         } else
         {                /* ~user/filename */
                 if (*++nm)
                     nm++;
             }
         } else
         {                /* ~user/filename */

-            register wxChar  *nnm;
-            register wxChar  *home;
+            register CharType  *nnm;

             for (s = nm; *s && *s != SEP; s++)
             {
                 // Empty
             for (s = nm; *s && *s != SEP; s++)
             {
                 // Empty


@@ -613,8 +663,8 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;
             *s = 0;
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;
             *s = 0;

-        // FIXME: wxGetUserHome could return temporary storage in Unicode mode
-            if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL)
+            homepath = wxGetUserHome(wxString(nm + 1));
+            if (homepath.empty())

             {
                 if (was_sep) /* replace only if it was there: */
                     *s = SEP;
             {
                 if (was_sep) /* replace only if it was there: */
                     *s = SEP;


@@ -623,7 +673,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             else
             {
                 nm = nnm;
             else
             {
                 nm = nnm;

-                s = home;
+                s = (CharType*)(const CharType*)homepath.c_str();

             }
         }
     }
             }
         }
     }


@@ -647,6 +697,17 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     return wxRealPath(buf);
 }
 
     return wxRealPath(buf);
 }
 

+char *wxExpandPath(char *buf, const wxString& name)
+{
+    return wxDoExpandPath(buf, name);
+}
+
+wchar_t *wxExpandPath(wchar_t *buf, const wxString& name)
+{
+    return wxDoExpandPath(buf, name);
+}
+
+

 /* Contract Paths to be build upon an environment variable
    component:
 
 /* Contract Paths to be build upon an environment variable
    component:
 


@@ -664,22 +725,22 @@ wxContractPath (const wxString& filename,
   if (filename.empty())
     return (wxChar *) NULL;
 
   if (filename.empty())
     return (wxChar *) NULL;
 

-  wxStrcpy (dest, WXSTRINGCAST filename);
+  wxStrcpy (dest, filename);

 #ifdef __WXMSW__
   wxUnix2DosFilename(dest);
 #endif
 
   // Handle environment
 #ifdef __WXMSW__
   wxUnix2DosFilename(dest);
 #endif
 
   // Handle environment

-  const wxChar *val;
+  wxString val;

 #ifndef __WXWINCE__
   wxChar *tcp;
 #ifndef __WXWINCE__
   wxChar *tcp;

-  if (!envname.empty() && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
+  if (!envname.empty() && !(val = wxGetenv (envname)).empty() &&

      (tcp = wxStrstr (dest, val)) != NULL)
     {
      (tcp = wxStrstr (dest, val)) != NULL)
     {

-        wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));
+        wxStrcpy (wxFileFunctionsBuffer, tcp + val.length());

         *tcp++ = wxT('$');
         *tcp++ = wxT('{');
         *tcp++ = wxT('$');
         *tcp++ = wxT('{');

-        wxStrcpy (tcp, WXSTRINGCAST envname);
+        wxStrcpy (tcp, envname);

         wxStrcat (tcp, wxT("}"));
         wxStrcat (tcp, wxFileFunctionsBuffer);
     }
         wxStrcat (tcp, wxT("}"));
         wxStrcat (tcp, wxFileFunctionsBuffer);
     }


@@ -687,10 +748,10 @@ wxContractPath (const wxString& filename,
 
   // Handle User's home (ignore root homes!)
   val = wxGetUserHome (user);
 
   // Handle User's home (ignore root homes!)
   val = wxGetUserHome (user);

-  if (!val)
+  if (val.empty())

     return dest;
 
     return dest;
 

-  const size_t len = wxStrlen(val);
+  const size_t len = val.length();

   if (len <= 2)
     return dest;
 
   if (len <= 2)
     return dest;
 


@@ -698,7 +759,7 @@ wxContractPath (const wxString& filename,
   {
     wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
     if (!user.empty())
   {
     wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
     if (!user.empty())

-           wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
+           wxStrcat(wxFileFunctionsBuffer, user);

     wxStrcat(wxFileFunctionsBuffer, dest + len);
     wxStrcpy (dest, wxFileFunctionsBuffer);
   }
     wxStrcat(wxFileFunctionsBuffer, dest + len);
     wxStrcpy (dest, wxFileFunctionsBuffer);
   }


@@ -794,7 +855,7 @@ wxString wxPathOnly (const wxString& path)
         wxChar buf[_MAXPATHLEN];
 
         // Local copy
         wxChar buf[_MAXPATHLEN];
 
         // Local copy

-        wxStrcpy (buf, WXSTRINGCAST path);
+        wxStrcpy(buf, path);

 
         int l = path.length();
         int i = l - 1;
 
         int l = path.length();
         int i = l - 1;


@@ -930,8 +991,8 @@ void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
 
 #endif // __WXMAC__
 
 
 #endif // __WXMAC__
 

-void
-wxDos2UnixFilename (wxChar *s)
+template<typename T>
+static void wxDoDos2UnixFilename(T *s)

 {
   if (s)
     while (*s)
 {
   if (s)
     while (*s)


@@ -940,17 +1001,21 @@ wxDos2UnixFilename (wxChar *s)
           *s = _T('/');
 #ifdef __WXMSW__
         else
           *s = _T('/');
 #ifdef __WXMSW__
         else

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

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

-void
+void wxDos2UnixFilename(char *s) { wxDoDos2UnixFilename(s); }
+void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); }
+
+template<typename T>
+static void

 #if defined(__WXMSW__) || defined(__OS2__)
 #if defined(__WXMSW__) || defined(__OS2__)

-wxUnix2DosFilename (wxChar *s)
+wxDoUnix2DosFilename(T *s)

 #else
 #else

-wxUnix2DosFilename (wxChar *WXUNUSED(s) )
+wxDoUnix2DosFilename(T *WXUNUSED(s) )

 #endif
 {
 // Yes, I really mean this to happen under DOS only! JACS
 #endif
 {
 // Yes, I really mean this to happen under DOS only! JACS


@@ -965,6 +1030,9 @@ wxUnix2DosFilename (wxChar *WXUNUSED(s) )
 #endif
 }
 
 #endif
 }
 

+void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); }
+void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); }
+

 // 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)


@@ -1003,6 +1071,51 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
 #endif
 }
 
 #endif
 }
 

+// helper of generic implementation of wxCopyFile()
+#if !(defined(__WIN32__) || defined(__OS2__) || defined(__PALMOS__)) && \
+    wxUSE_FILE
+
+static bool
+wxDoCopyFile(wxFile& fileIn,
+             const wxStructStat& fbuf,
+             const wxString& filenameDst,
+             bool overwrite)
+{
+    // reset the umask as we want to create the file with exactly the same
+    // permissions as the original one
+    wxCHANGE_UMASK(0);
+
+    // create file2 with the same permissions than file1 and open it for
+    // writing
+
+    wxFile fileOut;
+    if ( !fileOut.Create(filenameDst, overwrite, fbuf.st_mode & 0777) )
+        return false;
+
+    // copy contents of file1 to file2
+    char buf[4096];
+    for ( ;; )
+    {
+        ssize_t count = fileIn.Read(buf, WXSIZEOF(buf));
+        if ( count == wxInvalidOffset )
+            return false;
+
+        // end of file?
+        if ( !count )
+            break;
+
+        if ( fileOut.Write(buf, count) < (size_t)count )
+            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
+    return fileIn.Close() && fileOut.Close();
+}
+
+#endif // generic implementation of wxCopyFile
+

 // Copy files
 bool
 wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
 // Copy files
 bool
 wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)


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


@@ -1020,7 +1133,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
         return false;
     }
 #elif defined(__OS2__)
         return false;
     }
 #elif defined(__OS2__)

-    if ( ::DosCopy((PSZ)file1.c_str(), (PSZ)file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )
+    if ( ::DosCopy(file1.c_str(), file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )

         return false;
 #elif defined(__PALMOS__)
     // TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/
         return false;
 #elif defined(__PALMOS__)
     // TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/


@@ -1052,39 +1165,49 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
         return false;
     }
 
         return false;
     }
 

-    // reset the umask as we want to create the file with exactly the same
-    // permissions as the original one
-    wxCHANGE_UMASK(0);
+    wxDoCopyFile(fileIn, fbuf, file2, overwrite);

 
 

-    // 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;
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+    // copy the resource fork of the file too if it's present
+    wxString pathRsrcOut;
+    wxFile fileRsrcIn;

 
 

-    // copy contents of file1 to file2
-    char buf[4096];
-    size_t count;
-    for ( ;; )

     {
     {

-        count = fileIn.Read(buf, WXSIZEOF(buf));
-        if ( fileIn.Error() )
-            return false;
+        // suppress error messages from this block as resource forks don't have
+        // to exist
+        wxLogNull noLog;
+
+        // it's not enough to check for file existence: it always does on HFS
+        // but is empty for files without resources
+        if ( fileRsrcIn.Open(file1 + wxT("/..namedfork/rsrc")) &&
+                fileRsrcIn.Length() > 0 )
+        {
+            // we must be using HFS or another filesystem with resource fork
+            // support, suppose that destination file system also is HFS[-like]
+            pathRsrcOut = file2 + wxT("/..namedfork/rsrc");
+        }
+        else // check if we have resource fork in separate file (non-HFS case)
+        {
+            wxFileName fnRsrc(file1);
+            fnRsrc.SetName(wxT("._") + fnRsrc.GetName());

 
 

-        // end of file?
-        if ( !count )
-            break;
+            fileRsrcIn.Close();
+            if ( fileRsrcIn.Open( fnRsrc.GetFullPath() ) )
+            {
+                fnRsrc = file2;
+                fnRsrc.SetName(wxT("._") + fnRsrc.GetName());

 
 

-        if ( fileOut.Write(buf, count) < count )
-            return false;
+                pathRsrcOut = fnRsrc.GetFullPath();
+            }
+        }

     }
 
     }
 

-    // 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;
+    if ( !pathRsrcOut.empty() )
+    {
+        if ( !wxDoCopyFile(fileRsrcIn, fbuf, pathRsrcOut, overwrite) )
+            return false;
+    }
+#endif // wxMac || wxCocoa

 
 #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


@@ -1149,7 +1272,7 @@ bool wxRemoveFile(const wxString& file)
  || (defined(__MWERKS__) && defined(__MSL__))
     int res = wxRemove(file);
 #elif defined(__WXMAC__)
  || (defined(__MWERKS__) && defined(__MSL__))
     int res = wxRemove(file);
 #elif defined(__WXMAC__)

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

 #elif defined(__WXPALMOS__)
     int res = 1;
     // TODO with VFSFileDelete()
 #elif defined(__WXPALMOS__)
     int res = 1;
     // TODO with VFSFileDelete()


@@ -1165,7 +1288,7 @@ bool wxMkdir(const wxString& dir, int perm)
 #if defined(__WXPALMOS__)
     return false;
 #elif defined(__WXMAC__) && !defined(__UNIX__)
 #if defined(__WXPALMOS__)
     return false;
 #elif defined(__WXMAC__) && !defined(__UNIX__)

-    return (mkdir( wxFNCONV(dir) , 0 ) == 0);
+    return (mkdir(dir.fn_str() , 0 ) == 0);

 #else // !Mac
     const wxChar *dirname = dir.c_str();
 
 #else // !Mac
     const wxChar *dirname = dir.c_str();
 


@@ -1213,9 +1336,9 @@ 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__)
 #if defined(__VMS__)
     return false; //to be changed since rmdir exists in VMS7.x
 #elif defined(__OS2__)

-    return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
+    return (::DosDeleteDir(dir.c_str()) == 0);

 #elif defined(__WXWINCE__)
 #elif defined(__WXWINCE__)

-    return (CreateDirectory(dir, NULL) != 0);
+    return (RemoveDirectory(dir) != 0);

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


@@ -1225,14 +1348,14 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)
 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)

-bool wxDirExists(const wxChar *pszPathName)
+bool wxDirExists(const wxString& pathName)

 {
 {

-    wxString strPath(pszPathName);
+    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
 
 #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 pathes "d:\" (which are different from "d:") nor for just "\"
+    // the paths "d:\" (which are different from "d:") nor for just "\"

     while ( wxEndsWithPathSeparator(strPath) )
     {
         size_t len = strPath.length();
     while ( wxEndsWithPathSeparator(strPath) )
     {
         size_t len = strPath.length();


@@ -1253,7 +1376,7 @@ bool wxDirExists(const wxChar *pszPathName)
     return false;
 #elif defined(__WIN32__) && !defined(__WXMICROWIN__)
     // stat() can't cope with network paths
     return false;
 #elif defined(__WIN32__) && !defined(__WXMICROWIN__)
     // stat() can't cope with network paths

-    DWORD ret = ::GetFileAttributes(strPath);
+    DWORD ret = ::GetFileAttributes(strPath.fn_str());

 
     return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
 #elif defined(__OS2__)
 
     return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
 #elif defined(__OS2__)


@@ -1271,7 +1394,7 @@ bool wxDirExists(const wxChar *pszPathName)
     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_IFMT) == S_IFDIR);
 #else
     // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only

-    return wxStat(pszPathName, &st) == 0 && (st.st_mode == S_IFDIR);
+    return wxStat(strPath.c_str(), &st) == 0 && (st.st_mode == S_IFDIR);

 #endif
 
 #endif // __WIN32__/!__WIN32__
 #endif
 
 #endif // __WIN32__/!__WIN32__


@@ -1280,9 +1403,8 @@ bool wxDirExists(const wxChar *pszPathName)
 // 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)
 {

-#if wxUSE_FILE
-    wxString filename = wxFileName::CreateTempFileName(prefix);
-    if ( filename.empty() )
+    wxString filename;
+    if ( !wxGetTempFileName(prefix, filename) )

         return NULL;
 
     if ( buf )
         return NULL;
 
     if ( buf )


@@ -1291,19 +1413,20 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
         buf = MYcopystring(filename);
 
     return buf;
         buf = MYcopystring(filename);
 
     return buf;

-#else
-    wxUnusedVar(prefix);
-    wxUnusedVar(buf);
-    // wxFileName::CreateTempFileName needs wxFile class enabled
-    return NULL;
-#endif

 }
 
 bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 {
 }
 
 bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 {

-    buf = wxGetTempFileName(prefix);
+#if wxUSE_FILE
+    buf = wxFileName::CreateTempFileName(prefix);

 
     return !buf.empty();
 
     return !buf.empty();

+#else // !wxUSE_FILE
+    wxUnusedVar(prefix);
+    wxUnusedVar(buf);
+
+    return false;
+#endif // wxUSE_FILE/!wxUSE_FILE

 }
 
 // Get first file name matching given wild card.
 }
 
 // Get first file name matching given wild card.


@@ -1311,7 +1434,7 @@ bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 static wxDir *gs_dir = NULL;
 static wxString gs_dirPath;
 
 static wxDir *gs_dir = NULL;
 static wxString gs_dirPath;
 

-wxString wxFindFirstFile(const wxChar *spec, int flags)
+wxString wxFindFirstFile(const wxString& spec, int flags)

 {
     wxSplitPath(spec, &gs_dirPath, NULL, NULL);
     if ( gs_dirPath.empty() )
 {
     wxSplitPath(spec, &gs_dirPath, NULL, NULL);
     if ( gs_dirPath.empty() )


@@ -1338,7 +1461,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     }
 
     wxString result;
     }
 
     wxString result;

-    gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);
+    gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags);

     if ( result.empty() )
     {
         wxDELETE(gs_dir);
     if ( result.empty() )
     {
         wxDELETE(gs_dir);


@@ -1520,7 +1643,15 @@ wxString wxGetCwd()
 bool wxSetWorkingDirectory(const wxString& d)
 {
 #if defined(__OS2__)
 bool wxSetWorkingDirectory(const wxString& d)
 {
 #if defined(__OS2__)

-    return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
+    if (d[1] == ':')
+    {
+        ::DosSetDefaultDisk(1 + wxToupper(d[0]) - _T('A'));
+       // do not call DosSetCurrentDir when just changing drive,
+       // since it requires e.g. "d:." instead of "d:"!
+       if (d.length() == 2)
+           return true;
+    }
+    return (::DosSetCurrentDir(d.c_str()) == 0);

 #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__)


@@ -1531,7 +1662,7 @@ bool wxSetWorkingDirectory(const wxString& d)
     wxUnusedVar(d);
     return false;
 #else
     wxUnusedVar(d);
     return false;
 #else

-    return (bool)(SetCurrentDirectory(d) != 0);
+    return (bool)(SetCurrentDirectory(d.fn_str()) != 0);

 #endif
 #else
     // Must change drive, too.
 #endif
 #else
     // Must change drive, too.


@@ -1577,64 +1708,50 @@ wxString wxGetOSDirectory()
 #endif
 }
 
 #endif
 }
 

-bool wxEndsWithPathSeparator(const wxChar *pszFileName)
+bool wxEndsWithPathSeparator(const wxString& filename)

 {
 {

-    size_t len = wxStrlen(pszFileName);
-
-    return len && wxIsPathSeparator(pszFileName[len - 1]);
+    return !filename.empty() && wxIsPathSeparator(filename.Last());

 }
 
 // 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)
+bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& szFile)

 {
     // we assume that it's not empty
 {
     // we assume that it's not empty

-    wxCHECK_MSG( !wxIsEmpty(pszFile), false,
+    wxCHECK_MSG( !szFile.empty(), 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

-    if ( wxIsPathSeparator(*pszFile) )
-        pszFile++;
-
-    // copy the path (strtok will modify it)
-    wxChar *szPath = new wxChar[wxStrlen(pszPath) + 1];
-    wxStrcpy(szPath, pszPath);
-
-    wxString strFile;
-    wxChar *pc, *save_ptr;
-    for ( pc = wxStrtok(szPath, wxPATH_SEP, &save_ptr);
-          pc != NULL;
-          pc = wxStrtok((wxChar *) NULL, wxPATH_SEP, &save_ptr) )
+    wxString szFile2;
+    if ( wxIsPathSeparator(szFile[0u]) )
+        szFile2 = szFile.Mid(1);
+    else
+        szFile2 = szFile;
+
+    wxStringTokenizer tkn(szPath, wxPATH_SEP);
+
+    while ( tkn.HasMoreTokens() )

     {
     {

-        // search for the file in this directory
-        strFile = pc;
-        if ( !wxEndsWithPathSeparator(pc) )
+        wxString strFile = tkn.GetNextToken();
+        if ( !wxEndsWithPathSeparator(strFile) )

             strFile += wxFILE_SEP_PATH;
             strFile += wxFILE_SEP_PATH;

-        strFile += pszFile;
+        strFile += szFile2;

 
 

-        if ( wxFileExists(strFile) ) {
+        if ( wxFileExists(strFile) )
+        {

             *pStr = strFile;
             *pStr = strFile;

-            break;
+            return true;

         }
     }
 
         }
     }
 

-    // suppress warning about unused variable save_ptr when wxStrtok() is a
-    // macro which throws away its third argument
-    save_ptr = pc;
-
-    delete [] szPath;
-
-    return pc != NULL;  // if true => we breaked from the loop
+    return false;

 }
 
 }
 

-void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
+void WXDLLEXPORT wxSplitPath(const wxString& fileName,

                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt)
 {
                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt)
 {

-    // it can be empty, but it shouldn't be NULL
-    wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );
-
-    wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt);
+    wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);

 }
 
 #if wxUSE_DATETIME
 }
 
 #if wxUSE_DATETIME


@@ -1762,47 +1879,44 @@ int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
     return filters.GetCount();
 }
 
     return filters.GetCount();
 }
 

-#if defined( __WINDOWS__ )
-bool wxCheckGenericPermission(const wxString &path, DWORD access)
+#if defined(__WINDOWS__) && !(defined(__UNIX__) || defined(__OS2__))
+static bool wxCheckWin32Permission(const wxString& path, DWORD access)

 {
     // quoting the MSDN: "To obtain a handle to a directory, call the
 {
     // quoting the MSDN: "To obtain a handle to a directory, call the

-    // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag"
-    wxWinVersion ver = wxGetWinVersion();
+    // 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);
     bool isdir = wxDirExists(path);

-    if (isdir && (ver == wxWinVersion_95 || ver == wxWinVersion_98 || ver == wxWinVersion_ME))
+    if ( isdir && wxGetOsVersion() == wxOS_WINDOWS_9X )

     {
     {

-        // however Win95/98/ME do not support FILE_FLAG_BACKUP_SEMANTICS...
-        if (access == GENERIC_READ)
-        {
-            WIN32_FILE_ATTRIBUTE_DATA data;
-            if (GetFileAttributesEx(path.c_str(), GetFileExInfoStandard, &data) == 0)
-                return false;        // cannot query attributes
-            return (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) == 0;
-        }
-
-        // FIXME: is it true that directories are always writable & executable on Win9X family ?
+        // FAT directories always allow all access, even if they have the
+        // readonly flag set

         return true;
     }
         return true;
     }

-    else
-    {
-        HANDLE h = CreateFile(path.c_str(), access,
-                              FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
-                              OPEN_EXISTING, isdir ? FILE_FLAG_BACKUP_SEMANTICS : 0, NULL);
-        if (h != INVALID_HANDLE_VALUE)
-            CloseHandle(h);

 
 

-        return h != INVALID_HANDLE_VALUE;
-    }
+    HANDLE h = ::CreateFile
+                 (
+                    path.wx_str(),
+                    access,
+                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                    NULL,
+                    OPEN_EXISTING,
+                    isdir ? FILE_FLAG_BACKUP_SEMANTICS : 0,
+                    NULL
+                 );
+    if ( h != INVALID_HANDLE_VALUE )
+        CloseHandle(h);
+
+    return h != INVALID_HANDLE_VALUE;

 }
 }

-#endif
+#endif // __WINDOWS__

 
 bool wxIsWritable(const wxString &path)
 {
 
 bool wxIsWritable(const wxString &path)
 {

-#if defined( __UNIX__ )
+#if defined( __UNIX__ ) || defined(__OS2__)

     // access() will take in count also symbolic links
     // access() will take in count also symbolic links

-    return access(wxConvFile.cWX2MB(path), W_OK) == 0;
+    return access(path.fn_str(), W_OK) == 0;

 #elif defined( __WINDOWS__ )
 #elif defined( __WINDOWS__ )

-    return wxCheckGenericPermission(path, GENERIC_WRITE);
+    return wxCheckWin32Permission(path, GENERIC_WRITE);

 #else
     wxUnusedVar(path);
     // TODO
 #else
     wxUnusedVar(path);
     // TODO


@@ -1812,11 +1926,11 @@ bool wxIsWritable(const wxString &path)
 
 bool wxIsReadable(const wxString &path)
 {
 
 bool wxIsReadable(const wxString &path)
 {

-#if defined( __UNIX__ )
+#if defined( __UNIX__ ) || defined(__OS2__)

     // access() will take in count also symbolic links
     // access() will take in count also symbolic links

-    return access(wxConvFile.cWX2MB(path), R_OK) == 0;
+    return access(path.fn_str(), R_OK) == 0;

 #elif defined( __WINDOWS__ )
 #elif defined( __WINDOWS__ )

-    return wxCheckGenericPermission(path, GENERIC_READ);
+    return wxCheckWin32Permission(path, GENERIC_READ);

 #else
     wxUnusedVar(path);
     // TODO
 #else
     wxUnusedVar(path);
     // TODO


@@ -1826,11 +1940,11 @@ bool wxIsReadable(const wxString &path)
 
 bool wxIsExecutable(const wxString &path)
 {
 
 bool wxIsExecutable(const wxString &path)
 {

-#if defined( __UNIX__ )
+#if defined( __UNIX__ ) || defined(__OS2__)

     // access() will take in count also symbolic links
     // access() will take in count also symbolic links

-    return access(wxConvFile.cWX2MB(path), X_OK) == 0;
+    return access(path.fn_str(), X_OK) == 0;

 #elif defined( __WINDOWS__ )
 #elif defined( __WINDOWS__ )

-   return wxCheckGenericPermission(path, GENERIC_EXECUTE);
+   return wxCheckWin32Permission(path, GENERIC_EXECUTE);

 #else
     wxUnusedVar(path);
     // TODO
 #else
     wxUnusedVar(path);
     // TODO


@@ -1838,6 +1952,79 @@ bool wxIsExecutable(const wxString &path)
 #endif
 }
 
 #endif
 }
 

+// Return the type of an open file
+//
+// Some file types on some platforms seem seekable but in fact are not.
+// The main use of this function is to allow such cases to be detected
+// (IsSeekable() is implemented as wxGetFileKind() == wxFILE_KIND_DISK).
+//
+// This is important for the archive streams, which benefit greatly from
+// being able to seek on a stream, but which will produce corrupt archives
+// if they unknowingly seek on a non-seekable stream.
+//
+// wxFILE_KIND_DISK is a good catch all return value, since other values
+// disable features of the archive streams. Some other value must be returned
+// for a file type that appears seekable but isn't.
+//
+// Known examples:
+//   *  Pipes on Windows
+//   *  Files on VMS with a record format other than StreamLF
+//
+wxFileKind wxGetFileKind(int fd)
+{
+#if defined __WXMSW__ && !defined __WXWINCE__ && defined wxGetOSFHandle
+    switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE)
+    {
+        case FILE_TYPE_CHAR:
+            return wxFILE_KIND_TERMINAL;
+        case FILE_TYPE_DISK:
+            return wxFILE_KIND_DISK;
+        case FILE_TYPE_PIPE:
+            return wxFILE_KIND_PIPE;
+    }
+
+    return wxFILE_KIND_UNKNOWN;
+
+#elif defined(__UNIX__)
+    if (isatty(fd))
+        return wxFILE_KIND_TERMINAL;
+
+    struct stat st;
+    fstat(fd, &st);
+
+    if (S_ISFIFO(st.st_mode))
+        return wxFILE_KIND_PIPE;
+    if (!S_ISREG(st.st_mode))
+        return wxFILE_KIND_UNKNOWN;
+
+    #if defined(__VMS__)
+        if (st.st_fab_rfm != FAB$C_STMLF)
+            return wxFILE_KIND_UNKNOWN;
+    #endif
+
+    return wxFILE_KIND_DISK;
+
+#else
+    #define wxFILEKIND_STUB
+    (void)fd;
+    return wxFILE_KIND_DISK;
+#endif
+}
+
+wxFileKind wxGetFileKind(FILE *fp)
+{
+    // Note: The watcom rtl dll doesn't have fileno (the static lib does).
+    //       Should be fixed in version 1.4.
+#if defined(wxFILEKIND_STUB) || wxONLY_WATCOM_EARLIER_THAN(1,4)
+    (void)fp;
+    return wxFILE_KIND_DISK;
+#elif defined(__WINDOWS__) && !defined(__CYGWIN__) && !defined(__WATCOMC__) && !defined(__WINE__)
+    return fp ? wxGetFileKind(_fileno(fp)) : wxFILE_KIND_UNKNOWN;
+#else
+    return fp ? wxGetFileKind(fileno(fp)) : wxFILE_KIND_UNKNOWN;
+#endif
+}
+

 
 //------------------------------------------------------------------------
 // wild character routines
 
 //------------------------------------------------------------------------
 // wild character routines


@@ -1845,17 +2032,19 @@ bool wxIsExecutable(const wxString &path)
 
 bool wxIsWild( const wxString& pattern )
 {
 
 bool wxIsWild( const wxString& pattern )
 {

-    wxString tmp = pattern;
-    wxChar *pat = WXSTRINGCAST(tmp);
-    while (*pat)
+    for ( wxString::const_iterator p = pattern.begin(); p != pattern.end(); ++p )

     {
     {

-        switch (*pat++)
+        switch ( (*p).GetValue() )

         {
         {

-        case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
-            return true;
-        case wxT('\\'):
-            if (!*pat++)
-                return false;
+            case wxT('?'):
+            case wxT('*'):
+            case wxT('['):
+            case wxT('{'):
+                return true;
+
+            case wxT('\\'):
+                if ( ++p == pattern.end() )
+                    return false;

         }
     }
     return false;
         }
     }
     return false;


@@ -1970,77 +2159,6 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
     }
 }
 
     }
 }
 

-// Return the type of an open file
-//
-// Some file types on some platforms seem seekable but in fact are not.
-// The main use of this function is to allow such cases to be detected
-// (IsSeekable() is implemented as wxGetFileKind() == wxFILE_KIND_DISK).
-//
-// This is important for the archive streams, which benefit greatly from
-// being able to seek on a stream, but which will produce corrupt archives
-// if they unknowingly seek on a non-seekable stream.
-//
-// wxFILE_KIND_DISK is a good catch all return value, since other values
-// disable features of the archive streams. Some other value must be returned
-// for a file type that appears seekable but isn't.
-//
-// Known examples:
-//   *  Pipes on Windows
-//   *  Files on VMS with a record format other than StreamLF
-//
-wxFileKind wxGetFileKind(int fd)
-{
-#if defined __WXMSW__ && !defined __WXWINCE__ && defined wxGetOSFHandle
-    switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE)
-    {
-        case FILE_TYPE_CHAR:
-            return wxFILE_KIND_TERMINAL;
-        case FILE_TYPE_DISK:
-            return wxFILE_KIND_DISK;
-        case FILE_TYPE_PIPE:
-            return wxFILE_KIND_PIPE;
-    }
-
-    return wxFILE_KIND_UNKNOWN;
-
-#elif defined(__UNIX__)
-    if (isatty(fd))
-        return wxFILE_KIND_TERMINAL;
-
-    struct stat st;
-    fstat(fd, &st);
-
-    if (S_ISFIFO(st.st_mode))
-        return wxFILE_KIND_PIPE;
-    if (!S_ISREG(st.st_mode))
-        return wxFILE_KIND_UNKNOWN;
-
-    #if defined(__VMS__)
-        if (st.st_fab_rfm != FAB$C_STMLF)
-            return wxFILE_KIND_UNKNOWN;
-    #endif
-
-    return wxFILE_KIND_DISK;
-
-#else
-    #define wxFILEKIND_STUB
-    (void)fd;
-    return wxFILE_KIND_DISK;
-#endif
-}
-
-wxFileKind wxGetFileKind(FILE *fp)
-{
-    // Note: The watcom rtl dll doesn't have fileno (the static lib does).
-    //       Should be fixed in version 1.4.
-#if defined(wxFILEKIND_STUB) || wxONLY_WATCOM_EARLIER_THAN(1,4)
-    (void)fp;
-    return wxFILE_KIND_DISK;
-#else
-    return fp ? wxGetFileKind(fileno(fp)) : wxFILE_KIND_UNKNOWN;
-#endif
-}
-

 #ifdef __VISUALC__
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
 #ifdef __VISUALC__
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++