Removed #include <typeinfo> (since C++ RTTI is no longer used)

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 4bdaf881769b5b326cf1ed86127ef8cbb69d6c68..7a8f627a555d2bd5e0724a64582c2376799b9a29 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filefn.cpp
+// Name:        src/common/filefn.cpp

 // Purpose:     File- and directory-related functions
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Purpose:     File- and directory-related functions
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,22 +17,28 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "filefn.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

-#include "wx/defs.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

-#include "wx/utils.h"
-#include "wx/intl.h"
+#include "wx/filefn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/crt.h"
+#endif
+
+#include "wx/dynarray.h"

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

+#include "wx/dir.h"
+
+#include "wx/tokenzr.h"

 
 // there are just too many of those...
 #ifdef __VISUALC__
 
 // there are just too many of those...
 #ifdef __VISUALC__


@@ -43,91 +49,58 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#if !defined(__WATCOMC__)
+#if !wxONLY_WATCOM_EARLIER_THAN(1,4)

     #if !(defined(_MSC_VER) && (_MSC_VER > 800))
         #include <errno.h>
     #endif
 #endif
 
     #if !(defined(_MSC_VER) && (_MSC_VER > 800))
         #include <errno.h>
     #endif
 #endif
 

-#include <time.h>
-
-#ifndef __MWERKS__
-    #include <sys/types.h>
-    #include <sys/stat.h>
-#else
-    #include <stat.h>
-    #include <unistd.h>
-    #include <unix.h>
-#endif
-
-#ifdef __UNIX__
-    #include <unistd.h>
-    #include <dirent.h>
+#if defined(__WXMAC__)
+    #include  "wx/osx/private.h"  // includes mac headers

 #endif
 
 #endif
 

-#ifdef __WXPM__
-    #include <process.h>
-    #include "wx/os2/private.h"
-#endif
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
-    #include <direct.h>
-    #include <dos.h>
-    #include <io.h>
-#endif // __WINDOWS__
-#endif // native Win compiler
+#ifdef __WINDOWS__
+    #include "wx/msw/private.h"
+    #include "wx/msw/mslu.h"

 
 

-#ifdef __GNUWIN32__
-    #include <wchar.h>
-    #ifndef __TWIN32__
-        #include <sys/unistd.h>
+    // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
+    //
+    // note that it must be included after <windows.h>
+    #ifdef __GNUWIN32__
+        #ifdef __CYGWIN__
+            #include <sys/cygwin.h>
+        #endif
+    #endif // __GNUWIN32__
+
+    // io.h is needed for _get_osfhandle()
+    // Already included by filefn.h for many Windows compilers
+    #if defined __MWERKS__ || defined __CYGWIN__
+        #include <io.h>

     #endif
     #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/setup.h"
-#include "wx/log.h"
+#endif // __WINDOWS__

 
 

-// No, Cygwin doesn't appear to have fnmatch.h after all.
-#if defined(HAVE_FNMATCH_H)
-    #include "fnmatch.h"
+#if defined(__VMS__)
+    #include <fab.h>

 #endif
 
 #endif
 

-#ifdef __WINDOWS__
-    #include <windows.h>
+// TODO: Borland probably has _wgetcwd as well?
+#ifdef _MSC_VER
+    #define HAVE_WGETCWD

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

-#define _MAXPATHLEN 500
-
-extern wxChar *wxBuffer;
-
-#ifdef __WXMAC__
-#    include "MoreFiles.h"
-#    include "MoreFilesExtras.h"
-#    include "FullPath.h"
-#    include "FSpCompat.h"
+#ifndef _MAXPATHLEN
+    #define _MAXPATHLEN 1024

 #endif
 
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
-

 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
 

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

 static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400


@@ -135,131 +108,177 @@ static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 // VisualAge C++ V4.0 cannot have any external linkage const decs
 // in headers included by more than one primary source
 //
 // VisualAge C++ V4.0 cannot have any external linkage const decs
 // in headers included by more than one primary source
 //

-const off_t wxInvalidOffset = (off_t)-1;
+const int wxInvalidOffset = -1;

 #endif
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 #endif
 
 // ----------------------------------------------------------------------------
 // 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
 // ============================================================================
 

-void wxPathList::Add (const wxString& path)
+// ----------------------------------------------------------------------------
+// wrappers around standard POSIX functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_UNICODE && defined __BORLANDC__ \
+    && __BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551
+
+// 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)
+{
+    int moreflags = 0;
+
+    // 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
+
+// ----------------------------------------------------------------------------
+// wxPathList
+// ----------------------------------------------------------------------------
+
+bool wxPathList::Add(const wxString& path)

 {
 {

-    wxStringList::Add (WXSTRINGCAST 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
+    // not, as wxFileName would consider, a filename).
+    wxFileName fn(path + wxFileName::GetPathSeparator());
+
+    // add only normalized relative/absolute paths
+    // 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
+
+    return true;
+}
+
+void wxPathList::Add(const wxArrayString &arr)
+{
+    for (size_t j=0; j < arr.GetCount(); j++)
+        Add(arr[j]);

 }
 
 // Add paths e.g. from the PATH environment variable
 }
 
 // Add paths e.g. from the PATH environment variable

-void wxPathList::AddEnvList (const wxString& envVariable)
+void wxPathList::AddEnvList (const wxString& WXUNUSED_IN_WINCE(envVariable))

 {
 {

-  static const wxChar PATH_TOKS[] =
-#ifdef __WINDOWS__
-        wxT(" ;"); // Don't seperate with colon in DOS (used for drive)
+    // No environment variables on WinCE
+#ifndef __WXWINCE__
+
+    // The space has been removed from the tokenizers, otherwise a
+    // path such as "C:\Program Files" would be split into 2 paths:
+    // "C:\Program" and "Files"; this is true for both Windows and Unix.
+
+    static const wxChar PATH_TOKS[] =
+#if defined(__WINDOWS__) || defined(__OS2__)
+        wxT(";"); // Don't separate with colon in DOS (used for drive)

 #else
 #else

-        wxT(" :;");
+        wxT(":;");

 #endif
 
 #endif
 

-  wxChar *val = wxGetenv (WXSTRINGCAST envVariable);
-  if (val && *val)
+    wxString val;
+    if ( wxGetEnv(envVariable, &val) )

     {
     {

-      wxChar *s = copystring (val);
-      wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
-
-      if (token)
-      {
-          Add (copystring (token));
-          while (token)
-          {
-              if ((token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr)) != NULL)
-                  Add (wxString(token));
-          }
-      }
-
-      // suppress warning about unused variable save_ptr when wxStrtok() is a
-      // macro which throws away its third argument
-      save_ptr = token;
-
-      delete [] s;
+        // split into an array of string the value of the env var
+        wxArrayString arr = wxStringTokenize(val, PATH_TOKS);
+        WX_APPEND_ARRAY(*this, arr);

     }
     }

+#endif // !__WXWINCE__

 }
 
 // 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.IsEmpty() )
-    {
-        if ( !Member(path_only) )
-            Add(path_only);
-    }
+    return Add(wxPathOnly(path));

 }
 
 }
 

-bool wxPathList::Member (const wxString& path)
+#if WXWIN_COMPATIBILITY_2_6
+bool wxPathList::Member (const wxString& path) const

 {
 {

-  for (wxNode * node = First (); node != NULL; node = node->Next ())
-  {
-      wxString path2((wxChar *) node->Data ());
-      if (
-#if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__)
-      // Case INDEPENDENT
-          path.CompareTo (path2, wxString::ignoreCase) == 0
-#else
-      // Case sensitive File System
-          path.CompareTo (path2) == 0
-#endif
-        )
-        return TRUE;
-  }
-  return FALSE;
+    return Index(path) != wxNOT_FOUND;

 }
 }

+#endif

 
 

-wxString wxPathList::FindValidPath (const wxString& file)
+wxString wxPathList::FindValidPath (const wxString& file) const

 {
 {

-  if (wxFileExists (wxExpandPath(wxFileFunctionsBuffer, file)))
-    return wxString(wxFileFunctionsBuffer);
-
-  wxChar buf[_MAXPATHLEN];
-  wxStrcpy(buf, wxFileFunctionsBuffer);
-
-  wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
-  filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
+    // normalize the given string as it could be a path + a filename
+    // and not only a filename
+    wxFileName fn(file);
+    wxString strend;
+
+    // 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())
+        strend = fn.GetFullName();      // search for the file name and ignore the path part
+    else
+        strend = fn.GetFullPath();

 
 

-  for (wxNode * node = First (); node; node = node->Next ())
+    for (size_t i=0; i<GetCount(); i++)

     {
     {

-      wxChar *path = (wxChar *) node->Data ();
-      wxStrcpy (wxFileFunctionsBuffer, path);
-      wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
-      if (ch != wxT('\\') && ch != wxT('/'))
-        wxStrcat (wxFileFunctionsBuffer, wxT("/"));
-      wxStrcat (wxFileFunctionsBuffer, filename);
-#ifdef __WINDOWS__
-      Unix2DosFilename (wxFileFunctionsBuffer);
-#endif
-      if (wxFileExists (wxFileFunctionsBuffer))
-      {
-        return wxString(wxFileFunctionsBuffer);        // Found!
-      }
-    }                                // for()
+        wxString strstart = Item(i);
+        if (!strstart.IsEmpty() && strstart.Last() != wxFileName::GetPathSeparator())
+            strstart += wxFileName::GetPathSeparator();
+
+        if (wxFileExists(strstart + strend))
+            return strstart + strend;        // Found!
+    }

 
 

-  return wxString(wxT(""));                    // Not found
+    return wxEmptyString;                    // Not found

 }
 
 }
 

-wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
+wxString wxPathList::FindAbsoluteValidPath (const wxString& file) const

 {
     wxString f = FindValidPath(file);
 {
     wxString f = FindValidPath(file);

-    if ( wxIsAbsolutePath(f) )
+    if ( f.empty() || wxIsAbsolutePath(f) )

         return f;
 
         return f;
 

-    wxString buf;
-    wxGetWorkingDirectory(buf.GetWriteBuf(_MAXPATHLEN), _MAXPATHLEN - 1);
-    buf.UngetWriteBuf();
+    wxString buf = ::wxGetCwd();
+

     if ( !wxEndsWithPathSeparator(buf) )
     {
         buf += wxFILE_SEP_PATH;
     if ( !wxEndsWithPathSeparator(buf) )
     {
         buf += wxFILE_SEP_PATH;


@@ -269,53 +288,72 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
     return buf;
 }
 
     return buf;
 }
 

+// ----------------------------------------------------------------------------
+// miscellaneous global functions (TOFIX!)
+// ----------------------------------------------------------------------------
+
+static inline wxChar* MYcopystring(const wxString& s)
+{
+    wxChar* copy = new wxChar[s.length() + 1];
+    return wxStrcpy(copy, s.c_str());
+}
+
+template<typename CharType>
+static inline CharType* MYcopystring(const CharType* s)
+{
+    CharType* copy = new CharType[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}
+
+

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

-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    // GetFileAttributes can copy with network paths
-    DWORD ret = GetFileAttributes(filename);
-    DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY);
-    return ((ret != 0xffffffff) && (isDir == 0));
+#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
 #else

-    wxStructStat stbuf;
-    if ( !filename.empty() && wxStat (OS_FILENAME(filename), &stbuf) == 0 )
-        return TRUE;
-
-    return FALSE;
+    return wxStat( filename , &st) == 0 && S_ISREG(st.st_mode);

 #endif
 #endif

+#endif // __WIN32__/!__WIN32__

 }
 
 bool
 wxIsAbsolutePath (const wxString& filename)
 {
 }
 
 bool
 wxIsAbsolutePath (const wxString& filename)
 {

-    if (filename != wxT(""))
+    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('/'))
         // Unix like or Windows
         if (filename[0] == wxT('/'))

-            return TRUE;
-#endif
+            return true;

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

-            return TRUE;
+            return true;

 #endif
 #endif

-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) || defined(__OS2__)

         // MSDOS like
         if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
         // MSDOS like
         if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))

-            return TRUE;
+            return true;

 #endif
     }
 #endif
     }

-    return FALSE ;
+    return false ;

 }
 
 /*
 }
 
 /*


@@ -324,48 +362,50 @@ wxIsAbsolutePath (const wxString& filename)
  *
  */
 
  *
  */
 

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

 {
 {

-  int len = wxStrlen(buffer);
-  int i = len-1;
-  while (i > 0)
-  {
-    if (buffer[i] == wxT('.'))
+    int len = wxStrlen(buffer);
+    int i = len-1;
+    while (i > 0)

     {
     {

-      buffer[i] = 0;
-      break;
+        if (buffer[i] == wxT('.'))
+        {
+            buffer[i] = 0;
+            break;
+        }
+        i --;

     }
     }

-    i --;
-  }

 }
 
 }
 

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

 void wxStripExtension(wxString& buffer)
 {
 void wxStripExtension(wxString& buffer)
 {

-  size_t len = buffer.Length();
-  size_t i = len-1;
-  while (i > 0)
-  {
-    if (buffer.GetChar(i) == wxT('.'))
+    //RN:  Be careful about the handling the case where
+    //buffer.length() == 0
+    for(size_t i = buffer.length() - 1; i != wxString::npos; --i)

     {
     {

-      buffer = buffer.Left(i);
-      break;
+        if (buffer.GetChar(i) == wxT('.'))
+        {
+          buffer = buffer.Left(i);
+          break;
+        }

     }
     }

-    i --;
-  }

 }
 
 // Destructive removal of /./ and /../ stuff
 }
 
 // Destructive removal of /./ and /../ stuff

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

 {
 {

+  static const CharType SEP = wxFILE_SEP_PATH;

 #ifdef __WXMSW__
 #ifdef __WXMSW__

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

 #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


@@ -376,8 +416,12 @@ 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;
-                for (q = p - 1; q >= path && *q != SEP; q--);
+                CharType *q;
+                for (q = p - 1; q >= path && *q != SEP; q--)
+                {
+                    // Empty
+                }
+

                 if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP)
                     && (q - 1 <= path || q[-1] != SEP))
                   {
                 if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP)
                     && (q - 1 <= path || q[-1] != SEP))
                   {


@@ -387,7 +431,7 @@ wxChar *wxRealPath (wxChar *path)
                         path[0] = SEP;
                         path[1] = wxT('\0');
                       }
                         path[0] = SEP;
                         path[1] = wxT('\0');
                       }

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__OS2__)

                     /* Check that path[2] is NULL! */
                     else if (path[1] == wxT(':') && !path[2])
                       {
                     /* Check that path[2] is NULL! */
                     else if (path[1] == wxT(':') && !path[2])
                       {


@@ -406,28 +450,48 @@ 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);
+    wxChar *buf2=wxRealPath(buf1);
+    wxString buf(buf2);
+    delete [] buf1;
+    return buf;
+}
+
+

 // Must be destroyed
 wxChar *wxCopyAbsolutePath(const wxString& filename)
 {
 // Must be destroyed
 wxChar *wxCopyAbsolutePath(const wxString& filename)
 {

-  if (filename == wxT(""))
-    return (wxChar *) NULL;
+    if (filename.empty())
+        return (wxChar *) NULL;

 
 

-  if (! IsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
-    wxChar  buf[_MAXPATHLEN];
-    buf[0] = wxT('\0');
-    wxGetWorkingDirectory(buf, WXSIZEOF(buf));
-    wxChar ch = buf[wxStrlen(buf) - 1];
+    if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename)))
+    {
+        wxString buf = ::wxGetCwd();
+        wxChar ch = buf.Last();

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-    if (ch != wxT('\\') && ch != wxT('/'))
-        wxStrcat(buf, wxT("\\"));
+        if (ch != wxT('\\') && ch != wxT('/'))
+            buf << wxT("\\");

 #else
 #else

-    if (ch != wxT('/'))
-        wxStrcat(buf, wxT("/"));
+        if (ch != wxT('/'))
+            buf << wxT("/");

 #endif
 #endif

-    wxStrcat(buf, wxFileFunctionsBuffer);
-    return copystring( wxRealPath(buf) );
-  }
-  return copystring( wxFileFunctionsBuffer );
+        buf << wxFileFunctionsBuffer;
+        buf = wxRealPath( buf );
+        return MYcopystring( buf );
+    }
+    return MYcopystring( wxFileFunctionsBuffer );

 }
 
 /*-
 }
 
 /*-


@@ -453,38 +517,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;
 
     trimchars[0] = wxT('\n');
     trimchars[1] = wxT(' ');
     trimchars[2] = wxT('\t');
     trimchars[3] = 0;
 

+    static const CharType SEP = wxFILE_SEP_PATH;

 #ifdef __WXMSW__
 #ifdef __WXMSW__

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

 #endif
 #endif

+

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

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

         return buf;
         return buf;

-    nm = copystring(name); // Make a scratch copy
-    wxChar *nm_tmp = nm;
+    nm = ::MYcopystring(static_cast<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;


@@ -516,7 +581,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     while ((*d++ = *s) != 0) {
 #  ifndef __WXMSW__
         if (*s == wxT('\\')) {
     while ((*d++ = *s) != 0) {
 #  ifndef __WXMSW__
         if (*s == wxT('\\')) {

-            if ((*(d - 1) = *++s)) {
+            if ((*(d - 1) = *++s)!=0) {

                 s++;
                 continue;
             } else
                 s++;
                 continue;
             } else


@@ -524,15 +589,17 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
         } else
 #  endif
 #endif
         } else
 #  endif
 #endif

+            // No env variables on WinCE
+#ifndef __WXWINCE__

 #ifdef __WXMSW__
         if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
 #else
         if (*s++ == wxT('$'))
 #endif
         {
 #ifdef __WXMSW__
         if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
 #else
         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;


@@ -541,44 +608,56 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             *--d = 0;
             value = wxGetenv(braces ? start + 1 : start);
             if (value) {
             *--d = 0;
             value = wxGetenv(braces ? start + 1 : start);
             if (value) {

-                for ((d = start - 1); (*d++ = *value++) != 0;);
+                for ((d = start - 1); (*d++ = *value++) != 0;)
+                {
+                    // Empty
+                }
+

                 d--;
                 if (braces && *s)
                     s++;
             }
         }
                 d--;
                 if (braces && *s)
                     s++;
             }
         }

+#endif
+        // __WXWINCE__

     }
 
     /* Expand ~ and ~user */
     }
 
     /* Expand ~ and ~user */

+    wxString homepath;

     nm = lnm;
     nm = lnm;

-    s = wxT("");

     if (nm[0] == wxT('~') && !q)
     {
         /* prefix ~ */
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */
     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(wxT(""))) != 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;
-            for (s = nm; *s && *s != SEP; s++);
+            register CharType  *nnm;
+            for (s = nm; *s && *s != SEP; s++)
+            {
+                // Empty
+            }

             int was_sep; /* MATTHEW: Was there a separator, or NULL? */
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;
             *s = 0;
             int was_sep; /* MATTHEW: Was there a separator, or NULL? */
             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) {
-               if (was_sep) /* replace only if it was there: */
-                   *s = SEP;
-                s = wxT("");
-            } else {
+            homepath = wxGetUserHome(wxString(nm + 1));
+            if (homepath.empty())
+            {
+                if (was_sep) /* replace only if it was there: */
+                    *s = SEP;
+                s = NULL;
+            }
+            else
+            {

                 nm = nnm;
                 nm = nnm;

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

             }
         }
     }
             }
         }
     }


@@ -593,12 +672,26 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
           *(d - 1) = SEP;
     }
     s = nm;
           *(d - 1) = SEP;
     }
     s = nm;

-    while ((*d++ = *s++) != 0);
+    while ((*d++ = *s++) != 0)
+    {
+        // Empty
+    }

     delete[] nm_tmp; // clean up alloc
     /* Now clean up the buffer */
     return wxRealPath(buf);
 }
 
     delete[] nm_tmp; // clean up alloc
     /* Now clean up the buffer */
     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:
 


@@ -607,122 +700,78 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
    The call wxExpandPath can convert these back!
  */
 wxChar *
    The call wxExpandPath can convert these back!
  */
 wxChar *

-wxContractPath (const wxString& filename, const wxString& envname, const wxString& user)
+wxContractPath (const wxString& filename,
+                const wxString& WXUNUSED_IN_WINCE(envname),
+                const wxString& user)

 {
   static wxChar dest[_MAXPATHLEN];
 
 {
   static wxChar dest[_MAXPATHLEN];
 

-  if (filename == wxT(""))
+  if (filename.empty())

     return (wxChar *) NULL;
 
     return (wxChar *) NULL;
 

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

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-  Unix2DosFilename(dest);
+  wxUnix2DosFilename(dest);

 #endif
 
   // Handle environment
 #endif
 
   // Handle environment

-  const wxChar *val = (const wxChar *) NULL;
-  wxChar *tcp = (wxChar *) NULL;
-  if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
+  wxString val;
+#ifndef __WXWINCE__
+  wxChar *tcp;
+  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);
     }

+#endif

 
   // Handle User's home (ignore root homes!)
 
   // Handle User's home (ignore root homes!)

-  size_t len = 0;
-  if ((val = wxGetUserHome (user)) != NULL &&
-      (len = wxStrlen(val)) > 2 &&
-      wxStrncmp(dest, val, len) == 0)
-    {
-      wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
-      if (user != wxT(""))
-             wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
-#ifdef __WXMSW__
-//      strcat(wxFileFunctionsBuffer, "\\");
-#else
-//      strcat(wxFileFunctionsBuffer, "/");
-#endif
-      wxStrcat(wxFileFunctionsBuffer, dest + len);
-      wxStrcpy (dest, wxFileFunctionsBuffer);
-    }
+  val = wxGetUserHome (user);
+  if (val.empty())
+    return dest;
+
+  const size_t len = val.length();
+  if (len <= 2)
+    return dest;
+
+  if (wxStrncmp(dest, val, len) == 0)
+  {
+    wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
+    if (!user.empty())
+           wxStrcat(wxFileFunctionsBuffer, user);
+    wxStrcat(wxFileFunctionsBuffer, dest + len);
+    wxStrcpy (dest, wxFileFunctionsBuffer);
+  }

 
   return dest;
 }
 
 
   return dest;
 }
 

-// Return just the filename, not the path
-// (basename)
+// Return just the filename, not the path (basename)

 wxChar *wxFileNameFromPath (wxChar *path)
 {
 wxChar *wxFileNameFromPath (wxChar *path)
 {

-    if (path)
-    {
-        register wxChar *tcp;
-        
-        tcp = path + wxStrlen (path);
-        while (--tcp >= path)
-        {
-#if defined(__WXMAC__) && !defined(__DARWIN__)
-            // Classic or Carbon CodeWarrior like
-            // Carbon with Apple DevTools is Unix like
-            if (*tcp == wxT(':'))
-                return tcp + 1;
-#else
-            // Unix like or Windows
-            if (*tcp == wxT('/') || *tcp == wxT('\\'))
-                return tcp + 1;
-#endif
-#ifdef __VMS__
-            if (*tcp == wxT(':') || *tcp == wxT(']'))
-                return tcp + 1;
-#endif
-        } /* while */
-#if defined(__WXMSW__) || defined(__WXPM__)
-        // MSDOS like
-        if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
-            return path + 2;
-#endif
-    }
-    return path;
+    wxString p = path;
+    wxString n = wxFileNameFromPath(p);
+
+    return path + p.length() - n.length();

 }
 
 }
 

-wxString wxFileNameFromPath (const wxString& path1)
+wxString wxFileNameFromPath (const wxString& path)

 {
 {

-    if (path1 != wxT(""))
+    wxString name, ext;
+    wxFileName::SplitPath(path, NULL, &name, &ext);
+
+    wxString fullname = name;
+    if ( !ext.empty() )

     {
     {

-        wxChar *path = WXSTRINGCAST path1 ;
-        register wxChar *tcp;
-        
-        tcp = path + wxStrlen (path);
-        while (--tcp >= path)
-        {
-#if defined(__WXMAC__) && !defined(__DARWIN__)
-            // Classic or Carbon CodeWarrior like
-            // Carbon with Apple DevTools is Unix like
-            if (*tcp == wxT(':') )
-                return wxString(tcp + 1);
-#else
-            // Unix like or Windows
-            if (*tcp == wxT('/') || *tcp == wxT('\\'))
-                return wxString(tcp + 1);
-#endif
-#ifdef __VMS__
-            if (*tcp == wxT(':') || *tcp == wxT(']'))
-                return wxString(tcp + 1);
-#endif
-        } /* while */
-#if defined(__WXMSW__) || defined(__WXPM__)
-        // MSDOS like
-        if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
-            return wxString(path + 2);
-#endif
+        fullname << wxFILE_SEP_EXT << ext;

     }
     }

-    // Yes, this should return the path, not an empty string, otherwise
-    // we get "thing.txt" -> "".
-    return path1;
+
+    return fullname;

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


@@ -732,32 +781,22 @@ wxPathOnly (wxChar *path)
     if (path && *path)
     {
         static wxChar buf[_MAXPATHLEN];
     if (path && *path)
     {
         static wxChar buf[_MAXPATHLEN];

-        
+

         // Local copy
         wxStrcpy (buf, path);
         // Local copy
         wxStrcpy (buf, path);

-        
+

         int l = wxStrlen(path);
         int i = l - 1;
         int l = wxStrlen(path);
         int i = l - 1;

-        
+

         // 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(']'))
             {


@@ -767,8 +806,8 @@ wxPathOnly (wxChar *path)
 #endif
             i --;
         }
 #endif
             i --;
         }

-        
-#if defined(__WXMSW__) || defined(__WXPM__)
+
+#if defined(__WXMSW__) || defined(__OS2__)

         // Try Drive specifier
         if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
         {
         // Try Drive specifier
         if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
         {


@@ -785,35 +824,28 @@ wxPathOnly (wxChar *path)
 // Return just the directory, or NULL if no directory
 wxString wxPathOnly (const wxString& path)
 {
 // Return just the directory, or NULL if no directory
 wxString wxPathOnly (const wxString& path)
 {

-    if (path != wxT(""))
+    if (!path.empty())

     {
         wxChar buf[_MAXPATHLEN];
     {
         wxChar buf[_MAXPATHLEN];

-        
+

         // Local copy
         // Local copy

-        wxStrcpy (buf, WXSTRINGCAST path);
-        
-        int l = path.Length();
+        wxStrcpy(buf, path);
+
+        int l = path.length();

         int i = l - 1;
 
         // Search backward for a backward or forward slash
         while (i > -1)
         {
         int i = l - 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('\\'))
             {

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

                 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(']'))
             {


@@ -823,8 +855,8 @@ wxString wxPathOnly (const wxString& path)
 #endif
             i --;
         }
 #endif
             i --;
         }

-        
-#if defined(__WXMSW__) || defined(__WXPM__)
+
+#if defined(__WXMSW__) || defined(__OS2__)

         // Try Drive specifier
         if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
         {
         // Try Drive specifier
         if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
         {


@@ -835,172 +867,120 @@ wxString wxPathOnly (const wxString& path)
         }
 #endif
     }
         }
 #endif
     }

-    return wxString(wxT(""));
+    return wxEmptyString;

 }
 
 // Utility for converting delimiters in DOS filenames to UNIX style
 // and back again - or we get nasty problems with delimiters.
 // Also, convert to lower case, since case is significant in UNIX.
 
 }
 
 // Utility for converting delimiters in DOS filenames to UNIX style
 // and back again - or we get nasty problems with delimiters.
 // Also, convert to lower case, since case is significant in UNIX.
 

-#if defined(__WXMAC__)
-wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
-{
-#ifdef __DARWIN__
-    FSRef theRef;
-    char  thePath[FILENAME_MAX];
-
-    // convert the FSSpec to an FSRef
-    (void) FSpMakeFSRef( spec, &theRef );
-    // get the POSIX path associated with the FSRef
-    (void) FSRefMakePath( &theRef, (UInt8 *)thePath, sizeof(thePath) );
-    
-    // create path string for return value
-    wxString result( thePath ) ;
-#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( (char*) *myPath ) ;
-
-    // free allocated handle
-    ::HUnlock( myPath ) ;
-    ::DisposeHandle( myPath ) ;
-#endif
+#if defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)

 
 

-    return result ;
-}
+#define kDefaultPathStyle kCFURLPOSIXPathStyle

 
 

-void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
+wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )

 {
 {

-#ifdef __DARWIN__
-    FSRef theRef;
-
-    // get the FSRef associated with the POSIX path
-    (void) FSPathMakeRef((const UInt8 *) path, &theRef, NULL);
-    // convert the FSRef to an FSSpec
-    (void) FSGetCatalogInfo(&theRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
-#else
-    FSpLocationFromFullPath( strlen(path) , path , spec ) ;
-#endif
+    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 ) ;
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
+    CFRelease( cfString );
+    CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
+    return wxCFStringRef(cfMutableString).AsString();

 }
 
 }
 

-#ifndef __DARWIN__
-// Mac file names are POSIX (Unix style) under Darwin
-// therefore the conversion functions below are not needed
-
-static char sMacFileNameConversion[ 1000 ] ;
-
-wxString wxMac2UnixFilename (const char *str)
+OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )

 {
 {

-    char *s = sMacFileNameConversion ;
-    strcpy( s , str ) ;
-    if (s)
+    OSStatus err = noErr ;
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(path));
+    CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
+    CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
+    CFRelease( cfMutableString );
+    if ( NULL != url )

     {
     {

-        memmove( s+1 , s ,strlen( s ) + 1) ;
-        if ( *s == ':' )
-            *s = '.' ;
-        else
-            *s = '/' ;
-        
-        while (*s)
-        {
-            if (*s == ':')
-                *s = '/';
-            else
-                *s = wxTolower(*s);        // Case INDEPENDENT
-            s++;
-        }
+        if ( CFURLGetFSRef(url, fsRef) == false )
+            err = fnfErr ;
+        CFRelease( url ) ;
+    }
+    else
+    {
+        err = fnfErr ;

     }
     }

-    return wxString(sMacFileNameConversion) ;
+    return err ;

 }
 
 }
 

-wxString wxUnix2MacFilename (const char *str)
+wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )

 {
 {

-    char *s = sMacFileNameConversion ;
-    strcpy( s , str ) ;
-    if (s)
-    {
-        if ( *s == '.' )
-        {
-            // relative path , since it goes on with slash which is translated to a :
-            memmove( s , s+1 ,strlen( s ) ) ;
-        }
-        else if ( *s == '/' )
-        {
-            // absolute path -> on mac just start with the drive name
-            memmove( s , s+1 ,strlen( s ) ) ;
-        }
-        else
-        {
-            wxASSERT_MSG( 1 , "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 ,strlen( s+3 ) + 1 ) ;
-                }
-                else
-                    *s = ':';
-            }
-            s++ ;
-        }
-    }
-    return wxString (sMacFileNameConversion) ;
+    CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
+                                                      uniname->unicode,
+                                                      uniname->length );
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
+    CFRelease( cfname );
+    CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
+    return wxCFStringRef(cfMutableString).AsString() ;

 }
 
 }
 

-wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
+#ifndef __LP64__
+
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )

 {
 {

-    return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
+    FSRef fsRef ;
+    if ( FSpMakeFSRef( spec , &fsRef) == noErr )
+    {
+        return wxMacFSRefToPath( &fsRef ) ;
+    }
+    return wxEmptyString ;

 }
 
 }
 

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

 {
 {

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

 }
 }

-#endif // ! __DARWIN__
+#endif

 
 #endif // __WXMAC__
 
 
 #endif // __WXMAC__
 

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

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

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

 #ifdef __WXMSW__
         else
 #ifdef __WXMSW__
         else

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

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

-void
-#if defined(__WXMSW__) || defined(__WXPM__)
-wxUnix2DosFilename (wxChar *s)
+void wxDos2UnixFilename(char *s) { wxDoDos2UnixFilename(s); }
+void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); }
+
+template<typename T>
+static void
+#if defined(__WXMSW__) || defined(__OS2__)
+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

-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__OS2__)

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


@@ -1011,77 +991,131 @@ 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)
 {

-  wxString outfile;
-  if ( !wxGetTempFileName("cat", outfile) )
-      return FALSE;
-
-  FILE *fp1 = (FILE *) NULL;
-  FILE *fp2 = (FILE *) NULL;
-  FILE *fp3 = (FILE *) NULL;
-  // Open the inputs and outputs
-  if ((fp1 = wxFopen (OS_FILENAME( file1 ), wxT("rb"))) == NULL ||
-      (fp2 = wxFopen (OS_FILENAME( file2 ), wxT("rb"))) == NULL ||
-      (fp3 = wxFopen (OS_FILENAME( outfile ), wxT("wb"))) == NULL)
+#if wxUSE_FILE
+
+    wxFile in1(file1), in2(file2);
+    wxTempFile out(file3);
+
+    if ( !in1.IsOpened() || !in2.IsOpened() || !out.IsOpened() )
+        return false;
+
+    ssize_t ofs;
+    unsigned char buf[1024];
+
+    for( int i=0; i<2; i++)

     {
     {

-      if (fp1)
-        fclose (fp1);
-      if (fp2)
-        fclose (fp2);
-      if (fp3)
-        fclose (fp3);
-      return FALSE;
+        wxFile *in = i==0 ? &in1 : &in2;
+        do{
+            if ( (ofs = in->Read(buf,WXSIZEOF(buf))) == wxInvalidOffset ) return false;
+            if ( ofs > 0 )
+                if ( !out.Write(buf,ofs) )
+                    return false;
+        } while ( ofs == (ssize_t)WXSIZEOF(buf) );

     }
 
     }
 

-  int ch;
-  while ((ch = getc (fp1)) != EOF)
-    (void) putc (ch, fp3);
-  fclose (fp1);
+    return out.Commit();
+
+#else

 
 

-  while ((ch = getc (fp2)) != EOF)
-    (void) putc (ch, fp3);
-  fclose (fp2);
+    wxUnusedVar(file1);
+    wxUnusedVar(file2);
+    wxUnusedVar(file3);
+    return false;

 
 

-  fclose (fp3);
-  bool result = wxRenameFile(outfile, file3);
-  return result;
+#endif

 }
 
 }
 

-// Copy files
-bool
-wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
+// 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)

 {
 {

-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-    // CopyFile() copies file attributes and modification time too, so use it
-    // instead of our code if available
+    // 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)
+{
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    // CopyFile() copies file attributes and modification time too, so use it
+    // instead of our code if available

     //
     // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
     //
     // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite

-    return ::CopyFile(file1, file2, !overwrite) != 0;
-#elif defined(__WXPM__)
-    if (::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) == 0)
-        return TRUE;
-    else
-        return FALSE;
-#else // !Win32
-    wxStructStat fbuf;
+    if ( !::CopyFile(file1.fn_str(), file2.fn_str(), !overwrite) )
+    {
+        wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
+                      file1.c_str(), file2.c_str());

 
 

+        return false;
+    }
+#elif defined(__OS2__)
+    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 wxUSE_FILE // !Win32
+
+    wxStructStat fbuf;

     // get permissions of file1
     // get permissions of file1

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

     {
         // the file probably doesn't exist or we haven't the rights to read
         // from it anyhow
         wxLogSysError(_("Impossible to get permissions for file '%s'"),
                       file1.c_str());
     {
         // the file probably doesn't exist or we haven't the rights to read
         // 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


@@ -1089,48 +1123,52 @@ 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
-    mode_t oldUmask = umask( 0 );
-#endif // __UNIX__
+    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;
-
-#ifdef __UNIX__
-    /// restore the old umask
-    umask(oldUmask);
-#endif // __UNIX__
+#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


@@ -1139,28 +1177,50 @@ 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 // OS/2 || Mac
 

-    return TRUE;
+#else // !Win32 && ! wxUSE_FILE
+
+    // impossible to simulate with wxWidgets API
+    wxUnusedVar(file1);
+    wxUnusedVar(file2);
+    wxUnusedVar(overwrite);
+    return false;
+

 #endif // __WXMSW__ && __WIN32__
 #endif // __WXMSW__ && __WIN32__

+
+    return true;

 }
 
 bool
 }
 
 bool

-wxRenameFile (const wxString& file1, const wxString& file2)
+wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite)

 {
 {

-  // Normal system call
+    if ( !overwrite && wxFileExists(file2) )
+    {
+        wxLogSysError
+        (
+            _("Failed to rename the file '%s' to '%s' because the destination file already exists."),
+            file1.c_str(), file2.c_str()
+        );
+
+        return false;
+    }
+
+#if !defined(__WXWINCE__) && !defined(__WXPALMOS__)
+    // Normal system call

   if ( wxRename (file1, file2) == 0 )
   if ( wxRename (file1, file2) == 0 )

-    return TRUE;
+    return true;
+#endif

 
   // Try to copy
 
   // Try to copy

-  if (wxCopyFile(file1, file2)) {
+  if (wxCopyFile(file1, file2, overwrite)) {

     wxRemoveFile(file1);
     wxRemoveFile(file1);

-    return TRUE;
+    return true;

   }
   // Give up
   }
   // Give up

-  return FALSE;
+  return false;

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


@@ -1168,67 +1228,95 @@ bool wxRemoveFile(const wxString& file)
 #if defined(__VISUALC__) \
  || defined(__BORLANDC__) \
  || defined(__WATCOMC__) \
 #if defined(__VISUALC__) \
  || defined(__BORLANDC__) \
  || defined(__WATCOMC__) \

- || defined(__GNUWIN32__)
-  int res = wxRemove(file);
+ || defined(__DMC__) \
+ || defined(__GNUWIN32__) \
+ || (defined(__MWERKS__) && defined(__MSL__))
+    int res = wxRemove(file);
+#elif defined(__WXMAC__)
+    int res = unlink(file.fn_str());
+#elif defined(__WXPALMOS__)
+    int res = 1;
+    // TODO with VFSFileDelete()

 #else
 #else

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

 #endif
 
 #endif
 

-  return res == 0;
+    return res == 0;

 }
 
 bool wxMkdir(const wxString& dir, int perm)
 {
 }
 
 bool wxMkdir(const wxString& dir, int perm)
 {

-#if defined(__WXMAC__) && !defined(__UNIX__)
-  return (mkdir( dir , 0 ) == 0);
+#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();
 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler
 #else // !Mac
     const wxChar *dirname = dir.c_str();
 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler

-#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WXMICROWIN__)
+#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), perm) != 0 )

-#elif defined(__WXPM__)
+  #endif
+#elif defined(__OS2__)
+    wxUnusedVar(perm);

     if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
     if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??

-#else  // !MSW and !OS/2 VAC++
+#elif defined(__DOS__)
+  #if defined(__WATCOMC__)

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

+  #elif defined(__DJGPP__)
+    if ( mkdir(wxFNCONV(dirname), perm) != 0 )
+  #else
+    #error "Unsupported DOS compiler!"
+  #endif
+#else  // !MSW, !DOS and !OS/2 VAC++
+    wxUnusedVar(perm);
+#ifdef __WXWINCE__
+    if ( !CreateDirectory(dirname, NULL) )
+#else
+    if ( wxMkDir(dir.fn_str()) != 0 )
+#endif

 #endif // !MSW/MSW
     {
         wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
 
 #endif // !MSW/MSW
     {
         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))
 {
 #endif // Mac/!Mac
 }
 
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {

-#ifdef __VMS__
-  return FALSE; //to be changed since rmdir exists in VMS7.x
-#elif defined(__WXPM__)
-  return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
-#else
-
-#ifdef __SALFORDC__
-  return FALSE; // What to do?
+#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
 #else

-  return (wxRmDir(OS_FILENAME(dir)) == 0);
-#endif
-
+    return (wxRmDir(OS_FILENAME(dir)) == 0);

 #endif
 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)
 #endif
 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)

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

 {
 {

-    wxString strPath(pszPathName);
-#ifdef __WINDOWS__
+    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
     // 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();


@@ -1239,732 +1327,657 @@ bool wxPathExists(const wxChar *pszPathName)
     }
 #endif // __WINDOWS__
 
     }
 #endif // __WINDOWS__
 

-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    // Stat can't cope with network paths
-    DWORD ret = GetFileAttributes(strPath.c_str());
-    DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY);
-    return ((ret != 0xffffffff) && (isDir != 0));
-#else
+#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__
 
     wxStructStat st;
 #ifndef __VISAGECPP__

-    return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 &&
-        ((st.st_mode & S_IFMT) == S_IFDIR);
+    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
 #else
     // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only

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

 #endif
 
 #endif
 

-#endif
+#endif // __WIN32__/!__WIN32__

 }
 
 // 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 defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-
-#ifndef        __WIN32__
-  wxChar tmp[144];
-  ::GetTempFileName(0, WXSTRINGCAST prefix, 0, tmp);
+    wxString filename;
+    if ( !wxGetTempFileName(prefix, filename) )
+        return NULL;
+
+    if ( buf )
+#ifdef _PACC_VER
+        // work around the PalmOS pacc compiler bug
+        wxStrcpy(buf, filename.data());

 #else
 #else

-  wxChar tmp[MAX_PATH];
-  wxChar tmpPath[MAX_PATH];
-  ::GetTempPath(MAX_PATH, tmpPath);
-  ::GetTempFileName(tmpPath, WXSTRINGCAST prefix, 0, tmp);
+        wxStrcpy(buf, filename);

 #endif
 #endif

-  if (buf) wxStrcpy(buf, tmp);
-  else buf = copystring(tmp);
-  return buf;
-
-#else
-  static short last_temp = 0;        // cache last to speed things a bit
-  // At most 1000 temp files to a process! We use a ring count.
-  wxChar tmp[100]; // FIXME static buffer
+    else
+        buf = MYcopystring(filename);

 
 

-  for (short suffix = last_temp + 1; suffix != last_temp; ++suffix %= 1000)
-    {
-      wxSprintf (tmp, wxT("/tmp/%s%d.%03x"), WXSTRINGCAST prefix, (int) getpid (), (int) suffix);
-      if (!wxFileExists( tmp ))
-        {
-          // Touch the file to create it (reserve name)
-          FILE *fd = fopen (wxFNCONV(tmp), "w");
-          if (fd)
-            fclose (fd);
-          last_temp = suffix;
-          if (buf)
-            wxStrcpy( buf, tmp);
-          else
-            buf = copystring( tmp );
-          return buf;
-        }
-    }
-  wxLogError( _("wxWindows: error finding temporary file name.\n") );
-  if (buf) buf[0] = 0;
-  return (wxChar *) NULL;
-#endif
+    return buf;

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

-    wxChar buf2[512];
-    if (wxGetTempFileName(prefix, buf2) != (wxChar*) NULL)
-    {
-        buf = buf2;
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
+#if wxUSE_FILE
+    buf = wxFileName::CreateTempFileName(prefix);

 
 

-// Get first file name matching given wild card.
+    return !buf.empty();
+#else // !wxUSE_FILE
+    wxUnusedVar(prefix);
+    wxUnusedVar(buf);

 
 

-#if defined(__UNIX__)
+    return false;
+#endif // wxUSE_FILE/!wxUSE_FILE
+}

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

-// Flags are reserved for future use.

 
 

-#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
-    static DIR *gs_dirStream = (DIR *) NULL;
-    static wxString gs_strFileSpec;
-    static int gs_findFlags = 0;
-#endif
+static wxDir *gs_dir = NULL;
+static wxString gs_dirPath;

 
 

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

 {
 {

-    wxString result;
-#ifdef __VMS
-   wxChar *specvms = NULL;
-#endif
-
-#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
-    if (gs_dirStream)
-        closedir(gs_dirStream); // edz 941103: better housekeping
+    wxSplitPath(spec, &gs_dirPath, NULL, NULL);
+    if ( gs_dirPath.empty() )
+        gs_dirPath = wxT(".");
+    if ( !wxEndsWithPathSeparator(gs_dirPath ) )
+        gs_dirPath << wxFILE_SEP_PATH;

 
 

-    gs_findFlags = flags;
+    delete gs_dir; // can be NULL, this is ok
+    gs_dir = new wxDir(gs_dirPath);

 
 

-    gs_strFileSpec = spec;
-
-    // Find path only so we can concatenate
-    // found file onto path
-    wxString path(wxPathOnly(gs_strFileSpec));
-
-    // special case: path is really "/"
-    if ( !path && gs_strFileSpec[0u] == wxT('/') )
-#ifdef __VMS
-     {
-        wxStrcpy( specvms , wxT( "[000000]" ) );
-        gs_strFileSpec = specvms;
-        wxString path_vms(wxPathOnly(gs_strFileSpec));
-        path = path_vms;
-     }
-#else
-     path = wxT('/');
-#endif
-   // path is empty => Local directory
-    if ( !path )
-#ifdef __VMS
-     {
-        wxStrcpy( specvms , wxT( "[]" ) );
-        gs_strFileSpec = specvms;
-        wxString path_vms1(wxPathOnly(gs_strFileSpec));
-        path = path_vms1;
-     }
-#else
-     path = wxT('.');
-#endif
+    if ( !gs_dir->IsOpened() )
+    {
+        wxLogSysError(_("Can not enumerate files '%s'"), spec);
+        return wxEmptyString;
+    }

 
 

-    gs_dirStream = opendir(path.fn_str());
-    if ( !gs_dirStream )
+    int dirFlags;
+    switch (flags)

     {
     {

-        wxLogSysError(_("Can not enumerate files in directory '%s'"),
-                      path.c_str());
+        case wxDIR:  dirFlags = wxDIR_DIRS; break;
+        case wxFILE: dirFlags = wxDIR_FILES; break;
+        default:     dirFlags = wxDIR_DIRS | wxDIR_FILES; break;

     }
     }

-    else
+
+    wxString result;
+    gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags);
+    if ( result.empty() )

     {
     {

-        result = wxFindNextFile();
+        wxDELETE(gs_dir);
+        return result;

     }
     }

-#endif // !VMS6.x or earlier

 
 

-    return result;
+    return gs_dirPath + result;

 }
 
 wxString wxFindNextFile()
 {
 }
 
 wxString wxFindNextFile()
 {

-    wxString result;
-
-#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
-    wxCHECK_MSG( gs_dirStream, result, wxT("must call wxFindFirstFile first") );
+    wxCHECK_MSG( gs_dir, "", "You must call wxFindFirstFile before!" );

 
 

-    // Find path only so we can concatenate
-    // found file onto path
-    wxString path(wxPathOnly(gs_strFileSpec));
-    wxString name(wxFileNameFromPath(gs_strFileSpec));
-
-    /* MATTHEW: special case: path is really "/" */
-    if ( !path && gs_strFileSpec[0u] == wxT('/'))
-        path = wxT('/');
+    wxString result;
+    gs_dir->GetNext(&result);

 
 

-    // Do the reading
-    struct dirent *nextDir;
-    for ( nextDir = readdir(gs_dirStream);
-          nextDir != NULL;
-          nextDir = readdir(gs_dirStream) )
+    if ( result.empty() )

     {
     {

-        if (wxMatchWild(name, nextDir->d_name, FALSE) &&   // RR: added FALSE to find hidden files
-        strcmp(nextDir->d_name, ".") &&
-        strcmp(nextDir->d_name, "..") )
-        {
-            result.Empty();
-            if ( !path.IsEmpty() )
-            {
-                result = path;
-                if ( path != wxT('/') )
-                    result += wxT('/');
-            }
-
-            result += nextDir->d_name;
-
-            // Only return "." and ".." when they match
-            bool isdir;
-            if ( (strcmp(nextDir->d_name, ".") == 0) ||
-                 (strcmp(nextDir->d_name, "..") == 0))
-            {
-                if ( (gs_findFlags & wxDIR) != 0 )
-                    isdir = TRUE;
-                else
-                    continue;
-            }
-            else
-                isdir = wxDirExists(result);
-
-            // and only return directories when flags & wxDIR
-            if ( !gs_findFlags ||
-                 ((gs_findFlags & wxDIR) && isdir) ||
-                 ((gs_findFlags & wxFILE) && !isdir) )
-            {
-                return result;
-            }
-        }
+        wxDELETE(gs_dir);
+        return result;

     }
 
     }
 

-    result.Empty(); // not found
-
-    closedir(gs_dirStream);
-    gs_dirStream = (DIR *) NULL;
-#endif // !VMS6.2 or earlier
-
-    return result;
+    return gs_dirPath + result;

 }
 
 }
 

-#elif defined(__WXMAC__)

 
 

-struct MacDirectoryIterator
-{
-    CInfoPBRec            m_CPB ;
-    wxInt16                m_index ;
-    long                m_dirId ;
-    Str255                m_name ;
-} ;
-
-static int g_iter_flags ;
-
-static MacDirectoryIterator g_iter ;
-wxString g_iter_spec ;
+// Get current working directory.
+// If buf is NULL, allocates space using new, else copies into buf.
+// wxGetWorkingDirectory() is obsolete, use wxGetCwd()
+// wxDoGetCwd() is their common core to be moved
+// to wxGetCwd() once wxGetWorkingDirectory() will be removed.
+// Do not expose wxDoGetCwd in headers!

 
 

-wxString wxFindFirstFile(const wxChar *spec, int flags)
+wxChar *wxDoGetCwd(wxChar *buf, int sz)

 {
 {

-    wxString result;
-
-    g_iter_spec = spec ;
-    g_iter_spec.MakeUpper() ;
-    g_iter_flags = flags; /* MATTHEW: [5] Remember flags */
-
-    // Find path only so we can concatenate found file onto path
-    wxString path(wxPathOnly(spec));
-    FSSpec fsspec ;
+#if defined(__WXPALMOS__)
+    // TODO
+    if(buf && sz>0) buf[0] = _T('\0');
+    return buf;
+#elif defined(__WXWINCE__)
+    // TODO
+    if(buf && sz>0) buf[0] = _T('\0');
+    return buf;
+#else
+    if ( !buf )
+    {
+        buf = new wxChar[sz + 1];
+    }

 
 

-    wxMacFilename2FSSpec( path , &fsspec ) ;
-    g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
-    g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ;
-    g_iter.m_index = 0 ;
+    bool ok wxDUMMY_INITIALIZE(false);

 
 

-    Boolean isDir ;
-    FSpGetDirectoryID( &fsspec , &g_iter.m_dirId , &isDir ) ;
-    if ( !isDir )
-        return wxEmptyString ;
+    // 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;

 
 

-    return wxFindNextFile( ) ;
-}
+    #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
+        char cbuf[_MAXPATHLEN];
+    #endif

 
 

-wxString wxFindNextFile()
-{
-    wxString result;
+    #ifdef HAVE_WGETCWD
+        #if wxUSE_UNICODE_MSLU
+            if ( wxGetOsVersion() != wxOS_WINDOWS_9X )
+        #else
+            char *cbuf = NULL; // never really used because needsANSI will always be false
+        #endif
+            {
+                ok = _wgetcwd(buf, sz) != NULL;
+                needsANSI = false;
+            }
+    #endif

 
 

-    short err = noErr ;
-    wxString name ;
-    
-    while(1)
+    if ( needsANSI )
+#endif // wxUSE_UNICODE

     {
     {

-      while ( err == noErr )
-      {
-          g_iter.m_index++ ;
-          g_iter.m_CPB.dirInfo.ioFDirIndex = g_iter.m_index;
-          g_iter.m_CPB.dirInfo.ioDrDirID = g_iter.m_dirId;    /* we need to do this every time */
-          err = PBGetCatInfoSync((CInfoPBPtr)&g_iter.m_CPB);
-          if ( err != noErr )
-              break ;
-
-          if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (g_iter_flags & wxDIR) ) //  we have a directory
-              break ;
-
-          if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) )
-              continue ;
+    #if defined(_MSC_VER) || defined(__MINGW32__)
+        ok = _getcwd(cbuf, sz) != NULL;
+    #elif defined(__OS2__)
+        APIRET rc;
+        ULONG ulDriveNum = 0;
+        ULONG ulDriveMap = 0;
+        rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
+        ok = rc == 0;
+        if (ok)
+        {
+            sz -= 3;
+            rc = ::DosQueryCurrentDir( 0 // current drive
+                                      ,cbuf + 3
+                                      ,(PULONG)&sz
+                                     );
+            cbuf[0] = char('A' + (ulDriveNum - 1));
+            cbuf[1] = ':';
+            cbuf[2] = '\\';
+            ok = rc == 0;
+        }
+    #else // !Win32/VC++ !Mac !OS2
+        ok = getcwd(cbuf, sz) != NULL;
+    #endif // platform
+
+    #if wxUSE_UNICODE
+        // finally convert the result to Unicode if needed
+        wxConvFile.MB2WC(buf, cbuf, sz);
+    #endif // wxUSE_UNICODE
+    }

 
 

-          // hit !
-          break ;
-      }
-      if ( err != noErr )
-      {
-          return wxEmptyString ;
-      }
-      FSSpec spec ;
+    if ( !ok )
+    {
+        wxLogSysError(_("Failed to get the working directory"));

 
 

-      FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum,
-                                     g_iter.m_dirId,
-                                     g_iter.m_name,
-                                     &spec) ;
+        // VZ: the old code used to return "." on error which didn't make any
+        //     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');
+    }
+    else // ok, but we might need to massage the path into the right format
+    {
+#ifdef __DJGPP__
+        // VS: DJGPP is a strange mix of DOS and UNIX API and returns paths
+        //     with / deliminers. We don't like that.
+        for (wxChar *ch = buf; *ch; ch++)
+        {
+            if (*ch == wxT('/'))
+                *ch = wxT('\\');
+        }
+#endif // __DJGPP__

 
 

-      wxString name = wxMacFSSpec2MacFilename( &spec ) ;
-      if ( g_iter_spec.Right(4)==(":*.*") || g_iter_spec.Right(2)==(":*") || name.Upper().Matches(g_iter_spec) )
-        return name ;
+// MBN: we hope that in the case the user is compiling a GTK+/Motif app,
+//      he needs Unix as opposed to Win32 pathnames
+#if defined( __CYGWIN__ ) && defined( __WINDOWS__ )
+        // another example of DOS/Unix mix (Cygwin)
+        wxString pathUnix = buf;
+#if wxUSE_UNICODE
+        char bufA[_MAXPATHLEN];
+        cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA);
+        wxConvFile.MB2WC(buf, bufA, sz);
+#else
+        cygwin_conv_to_full_win32_path(pathUnix, buf);
+#endif // wxUSE_UNICODE
+#endif // __CYGWIN__

     }
     }

-    return wxEmptyString ;
-}

 
 

-#elif defined(__WXMSW__)
+    return buf;

 
 

-#ifdef __WIN32__
-    static HANDLE gs_hFileStruct = INVALID_HANDLE_VALUE;
-    static WIN32_FIND_DATA gs_findDataStruct;
-#else // Win16
-    #ifdef __BORLANDC__
-        static struct ffblk gs_findDataStruct;
-    #else
-        static struct _find_t gs_findDataStruct;
-    #endif // Borland
-#endif // Win32/16
+#if !wxUSE_UNICODE
+    #undef cbuf
+#endif

 
 

-static wxString gs_strFileSpec;
-static int gs_findFlags = 0;
+#endif
+    // __WXWINCE__
+}

 
 

-wxString wxFindFirstFile(const wxChar *spec, int flags)
+#if WXWIN_COMPATIBILITY_2_6
+wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)

 {
 {

-    wxString result;
-
-    gs_strFileSpec = spec;
-    gs_findFlags = flags; /* MATTHEW: [5] Remember flags */
-
-    // Find path only so we can concatenate found file onto path
-    wxString path(wxPathOnly(gs_strFileSpec));
-    if ( !path.IsEmpty() )
-        result << path << wxT('\\');
-
-#ifdef __WIN32__
-    if ( gs_hFileStruct != INVALID_HANDLE_VALUE )
-        FindClose(gs_hFileStruct);
+    return wxDoGetCwd(buf,sz);
+}
+#endif // WXWIN_COMPATIBILITY_2_6

 
 

-    gs_hFileStruct = ::FindFirstFile(WXSTRINGCAST spec, &gs_findDataStruct);
+wxString wxGetCwd()
+{
+    wxString str;
+    wxDoGetCwd(wxStringBuffer(str, _MAXPATHLEN), _MAXPATHLEN);
+    return str;
+}

 
 

-    if ( gs_hFileStruct == INVALID_HANDLE_VALUE )
+bool wxSetWorkingDirectory(const wxString& d)
+{
+#if defined(__OS2__)
+    if (d[1] == ':')

     {
     {

-        result.Empty();
-
-        return result;
+        ::DosSetDefaultDisk(wxToupper(d[0]) - _T('A') + 1);
+    // 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__)

 
 

-    bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
-
-    if (isdir && !(flags & wxDIR))
-        return wxFindNextFile();
-    else if (!isdir && flags && !(flags & wxFILE))
-        return wxFindNextFile();
-
-    result += gs_findDataStruct.cFileName;
-
-    return result;
-#else // !Win32
-    int flag = _A_NORMAL;
-    if (flags & wxDIR)
-        flag = _A_SUBDIR;
-
-#ifdef __BORLANDC__
-    if (findfirst(WXSTRINGCAST spec, &gs_findDataStruct, flag) == 0)
+#ifdef __WIN32__
+#ifdef __WXWINCE__
+    // No equivalent in WinCE
+    wxUnusedVar(d);
+    return false;

 #else
 #else

-        if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
+    return (bool)(SetCurrentDirectory(d.fn_str()) != 0);

 #endif
 #endif

+#else
+    // Must change drive, too.
+    bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
+    if (isDriveSpec)
+    {
+        wxChar firstChar = d[0];
+
+        // To upper case
+        if (firstChar > 90)
+            firstChar = firstChar - 32;
+
+        // To a drive number
+        unsigned int driveNo = firstChar - 64;
+        if (driveNo > 0)

         {
         {

-            char attrib;
+            unsigned int noDrives;
+            _dos_setdrive(driveNo, &noDrives);
+        }
+    }
+    bool success = (chdir(WXSTRINGCAST d) == 0);

 
 

-#ifdef __BORLANDC__
-            attrib = gs_findDataStruct.ff_attrib;
-#else
-            attrib = gs_findDataStruct.attrib;
+    return success;

 #endif
 
 #endif
 

-            if (attrib & _A_SUBDIR) {
-                if (!(gs_findFlags & wxDIR))
-                    return wxFindNextFile();
-            } else if (gs_findFlags && !(gs_findFlags & wxFILE))
-                return wxFindNextFile();
+#endif
+}

 
 

-            result +=
-#ifdef __BORLANDC__
-                    gs_findDataStruct.ff_name
+// Get the OS directory if appropriate (such as the Windows directory).
+// On non-Windows platform, probably just return the empty string.
+wxString wxGetOSDirectory()
+{
+#ifdef __WXWINCE__
+    return wxString(wxT("\\Windows"));
+#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+    wxChar buf[256];
+    GetWindowsDirectory(buf, 256);
+    return wxString(buf);
+#elif defined(__WXMAC__) && wxOSX_USE_CARBON
+    return wxMacFindFolder(kOnSystemDisk, 'macs', false);

 #else
 #else

-                    gs_findDataStruct.name
+    return wxEmptyString;

 #endif
 #endif

-                    ;
-        }
-
-    return result;
-#endif // __WIN32__

 }
 
 }
 

-
-wxString wxFindNextFile()
+bool wxEndsWithPathSeparator(const wxString& filename)

 {
 {

-    wxString result;
-
-    // Find path only so we can concatenate found file onto path
-    wxString path(wxPathOnly(gs_strFileSpec));
-
-try_again:
+    return !filename.empty() && wxIsPathSeparator(filename.Last());
+}

 
 

-#ifdef __WIN32__
-    if (gs_hFileStruct == INVALID_HANDLE_VALUE)
-        return result;
+// find a file in a list of directories, returns false if not found
+bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& szFile)
+{
+    // we assume that it's not empty
+    wxCHECK_MSG( !szFile.empty(), false,
+                 _T("empty file name in wxFindFileInPath"));

 
 

-    bool success = (FindNextFile(gs_hFileStruct, &gs_findDataStruct) != 0);
-    if (!success)
-    {
-        FindClose(gs_hFileStruct);
-        gs_hFileStruct = INVALID_HANDLE_VALUE;
-    }
+    // skip path separator in the beginning of the file name if present
+    wxString szFile2;
+    if ( wxIsPathSeparator(szFile[0u]) )
+        szFile2 = szFile.Mid(1);

     else
     else

-    {
-        bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
+        szFile2 = szFile;

 
 

-        if (isdir && !(gs_findFlags & wxDIR))
-            goto try_again;
-        else if (!isdir && gs_findFlags && !(gs_findFlags & wxFILE))
-            goto try_again;
+    wxStringTokenizer tkn(szPath, wxPATH_SEP);

 
 

-        if ( !path.IsEmpty() )
-            result << path << wxT('\\');
-        result << gs_findDataStruct.cFileName;
-    }
-
-    return result;
-#else // Win16
+    while ( tkn.HasMoreTokens() )
+    {
+        wxString strFile = tkn.GetNextToken();
+        if ( !wxEndsWithPathSeparator(strFile) )
+            strFile += wxFILE_SEP_PATH;
+        strFile += szFile2;

 
 

-#ifdef __BORLANDC__
-    if (findnext(&gs_findDataStruct) == 0)
-#else
-        if (_dos_findnext(&gs_findDataStruct) == 0)
-#endif
+        if ( wxFileExists(strFile) )

         {
         {

-            /* MATTHEW: [5] Check directory flag */
-            char attrib;
-
-#ifdef __BORLANDC__
-            attrib = gs_findDataStruct.ff_attrib;
-#else
-            attrib = gs_findDataStruct.attrib;
-#endif
-
-            if (attrib & _A_SUBDIR) {
-                if (!(gs_findFlags & wxDIR))
-                    goto try_again;
-            } else if (gs_findFlags && !(gs_findFlags & wxFILE))
-                goto try_again;
-
-
-            result +=
-#ifdef __BORLANDC__
-                      gs_findDataStruct.ff_name
-#else
-                      gs_findDataStruct.name
-#endif
-                      ;
+            *pStr = strFile;
+            return true;

         }
         }

+    }

 
 

-    return result;
-#endif // Win32/16
+    return false;

 }
 
 }
 

-#elif defined(__WXPM__)
-
-wxString wxFindFirstFile(const wxChar *spec, int flags)
+void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
+                             wxString *pstrPath,
+                             wxString *pstrName,
+                             wxString *pstrExt)

 {
 {

-    wxString result;
+    wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
+}

 
 

-    /*
-    // TODO: figure something out here for OS/2
-    gs_strFileSpec = spec;
-    gs_findFlags = flags;
+#if wxUSE_DATETIME

 
 

-    // Find path only so we can concatenate found file onto path
-    wxString path(wxPathOnly(gs_strFileSpec));
-    if ( !path.IsEmpty() )
-        result << path << wxT('\\');
+time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)
+{
+    wxDateTime mtime;
+    if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
+        return (time_t)-1;

 
 

-    int flag = _A_NORMAL;
-    if (flags & wxDIR)
-        flag = _A_SUBDIR;
+    return mtime.GetTicks();
+}

 
 

-    if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
-    {
-        char attrib;
-        attrib = gs_findDataStruct.attrib;
+#endif // wxUSE_DATETIME

 
 

-        if (attrib & _A_SUBDIR) {
-            if (!(gs_findFlags & wxDIR))
-                return wxFindNextFile();
-        } else if (gs_findFlags && !(gs_findFlags & wxFILE))
-            return wxFindNextFile();

 
 

-        result += gs_findDataStruct.name;
-    }
-    */
-    return result;
-}
+// Parses the filterStr, returning the number of filters.
+// Returns 0 if none or if there's a problem.
+// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"

 
 

-wxString wxFindNextFile()
+int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
+                                           wxArrayString& descriptions,
+                                           wxArrayString& filters)

 {
 {

-    wxString result;
-    // TODO:
-    return result;
-}
+    descriptions.Clear();
+    filters.Clear();

 
 

-#endif // Unix/Windows/OS/2
+    wxString str(filterStr);

 
 

-// Get current working directory.
-// If buf is NULL, allocates space using new, else
-// copies into buf.
-wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
-{
-  if (!buf)
-    buf = new wxChar[sz+1];
-#if wxUSE_UNICODE
-  char *cbuf = new char[sz+1];
-#ifdef _MSC_VER
-  if (_getcwd(cbuf, sz) == NULL) {
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-    enum
+    wxString description, filter;
+    int pos = 0;
+    while( pos != wxNOT_FOUND )

     {
     {

-        SFSaveDisk = 0x214, CurDirStore = 0x398
-    };
-    FSSpec cwdSpec ;
-
-    FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
-    wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
-    strcpy( buf , res ) ;
-    if (0) {
-#else
-  if (getcwd(cbuf, sz) == NULL) {
-#endif
-    delete [] cbuf;
-#else // wxUnicode
-#ifdef _MSC_VER
-  if (_getcwd(buf, 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 )
-    {
-        cwdSpec.vRefNum = pb.ioFCBVRefNum;
-        cwdSpec.parID = pb.ioFCBParID;
-        cwdSpec.name[0] = 0 ;
-        wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
+        pos = str.Find(wxT('|'));
+        if ( pos == wxNOT_FOUND )
+        {
+            // if there are no '|'s at all in the string just take the entire
+            // string as filter and make description empty for later autocompletion
+            if ( filters.IsEmpty() )
+            {
+                descriptions.Add(wxEmptyString);
+                filters.Add(filterStr);
+            }
+            else
+            {
+                wxFAIL_MSG( _T("missing '|' in the wildcard string!") );
+            }
+
+            break;
+        }
+
+        description = str.Left(pos);
+        str = str.Mid(pos + 1);
+        pos = str.Find(wxT('|'));
+        if ( pos == wxNOT_FOUND )
+        {
+            filter = str;
+        }
+        else
+        {
+            filter = str.Left(pos);
+            str = str.Mid(pos + 1);
+        }

 
 

-        strcpy( buf , res ) ;
-        buf[res.length()]=0 ;
+        descriptions.Add(description);
+        filters.Add(filter);

     }
     }

-    else
-        buf[0] = 0 ;
-    /*
-    this version will not always give back the application directory on mac
-    enum
+
+#if defined(__WXMOTIF__)
+    // split it so there is one wildcard per entry
+    for( size_t i = 0 ; i < descriptions.GetCount() ; i++ )

     {
     {

-        SFSaveDisk = 0x214, CurDirStore = 0x398
-    };
-    FSSpec cwdSpec ;
-
-    FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
-    wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
-    strcpy( buf , res ) ;
-    */
-    if (0) {
-#elif defined(__VISAGECPP__) || (defined (__OS2__) && defined (__WATCOMC__))
-    APIRET rc;
-    rc = ::DosQueryCurrentDir( 0 // current drive
-                              ,buf
-                              ,(PULONG)&sz
-                             );
-    if (rc != 0) {
-#else
-  if (getcwd(buf, sz) == NULL) {
-#endif
-#endif
-    buf[0] = wxT('.');
-    buf[1] = wxT('\0');
-  }
-#if wxUSE_UNICODE
-  else {
-    wxConvFile.MB2WC(buf, cbuf, sz);
-    delete [] cbuf;
-  }
+        pos = filters[i].Find(wxT(';'));
+        if (pos != wxNOT_FOUND)
+        {
+            // first split only filters
+            descriptions.Insert(descriptions[i],i+1);
+            filters.Insert(filters[i].Mid(pos+1),i+1);
+            filters[i]=filters[i].Left(pos);
+
+            // autoreplace new filter in description with pattern:
+            //     C/C++ Files(*.cpp;*.c;*.h)|*.cpp;*.c;*.h
+            // cause split into:
+            //     C/C++ Files(*.cpp)|*.cpp
+            //     C/C++ Files(*.c;*.h)|*.c;*.h
+            // and next iteration cause another split into:
+            //     C/C++ Files(*.cpp)|*.cpp
+            //     C/C++ Files(*.c)|*.c
+            //     C/C++ Files(*.h)|*.h
+            for ( size_t k=i;k<i+2;k++ )
+            {
+                pos = descriptions[k].Find(filters[k]);
+                if (pos != wxNOT_FOUND)
+                {
+                    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))
+                    {
+                        before = before.Left(pos+1);
+                        before << filters[k];
+                        pos = after.Find(_T(')'));
+                        int pos1 = after.Find(_T('('));
+                        if (pos != wxNOT_FOUND && (pos<pos1 || pos1==wxNOT_FOUND))
+                        {
+                            before << after.Mid(pos);
+                            descriptions[k] = before;
+                        }
+                    }
+                }
+            }
+        }
+    }

 #endif
 #endif

-  return buf;
-}
-
-wxString wxGetCwd()
-{
-    static const size_t maxPathLen = 1024;

 
 

-    wxString str;
-    wxGetWorkingDirectory(str.GetWriteBuf(maxPathLen), maxPathLen);
-    str.UngetWriteBuf();
+    // autocompletion
+    for( size_t j = 0 ; j < descriptions.GetCount() ; j++ )
+    {
+        if ( descriptions[j].empty() && !filters[j].empty() )
+        {
+            descriptions[j].Printf(_("Files (%s)"), filters[j].c_str());
+        }
+    }

 
 

-    return str;
+    return filters.GetCount();

 }
 
 }
 

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

 {
 {

-#if defined( __UNIX__ ) || defined( __WXMAC__ )
-  return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
-#elif defined(__WXPM__)
-  return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
-#elif defined(__WINDOWS__)
-
-#ifdef __WIN32__
-  return (bool)(SetCurrentDirectory(d) != 0);
-#else
-  // Must change drive, too.
-  bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
-  if (isDriveSpec)
-  {
-    wxChar firstChar = d[0];
-
-    // To upper case
-    if (firstChar > 90)
-      firstChar = firstChar - 32;
-
-    // To a drive number
-    unsigned int driveNo = firstChar - 64;
-    if (driveNo > 0)
+    // 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 )

     {
     {

-       unsigned int noDrives;
-       _dos_setdrive(driveNo, &noDrives);
+        // FAT directories always allow all access, even if they have the
+        // readonly flag set
+        return true;

     }
     }

-  }
-  bool success = (chdir(WXSTRINGCAST d) == 0);

 
 

-  return success;
-#endif
+    HANDLE h = ::CreateFile
+                 (
+                    path.t_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 // __WINDOWS__

 
 

+bool wxIsWritable(const wxString &path)
+{
+#if defined( __UNIX__ ) || defined(__OS2__)
+    // access() will take in count also symbolic links
+    return wxAccess(path.c_str(), W_OK) == 0;
+#elif defined( __WINDOWS__ )
+    return wxCheckWin32Permission(path, GENERIC_WRITE);
+#else
+    wxUnusedVar(path);
+    // TODO
+    return false;

 #endif
 }
 
 #endif
 }
 

-// Get the OS directory if appropriate (such as the Windows directory).
-// On non-Windows platform, probably just return the empty string.
-wxString wxGetOSDirectory()
+bool wxIsReadable(const wxString &path)

 {
 {

-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    wxChar buf[256];
-    GetWindowsDirectory(buf, 256);
-    return wxString(buf);
+#if defined( __UNIX__ ) || defined(__OS2__)
+    // access() will take in count also symbolic links
+    return wxAccess(path.c_str(), R_OK) == 0;
+#elif defined( __WINDOWS__ )
+    return wxCheckWin32Permission(path, GENERIC_READ);

 #else
 #else

-    return wxEmptyString;
+    wxUnusedVar(path);
+    // TODO
+    return false;

 #endif
 }
 
 #endif
 }
 

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

 {
 {

-  size_t len = wxStrlen(pszFileName);
-  if ( len == 0 )
-    return FALSE;
-  else
-    return wxIsPathSeparator(pszFileName[len - 1]);
+#if defined( __UNIX__ ) || defined(__OS2__)
+    // access() will take in count also symbolic links
+    return wxAccess(path.c_str(), X_OK) == 0;
+#elif defined( __WINDOWS__ )
+   return wxCheckWin32Permission(path, GENERIC_EXECUTE);
+#else
+    wxUnusedVar(path);
+    // TODO
+    return false;
+#endif

 }
 
 }
 

-// find a file in a list of directories, returns false if not found
-bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
+// 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)

 {
 {

-    // we assume that it's not empty
-    wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE,
-                 _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) )
+#if defined __WXMSW__ && !defined __WXWINCE__ && defined wxGetOSFHandle
+    switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE)

     {
     {

-        // search for the file in this directory
-        strFile = pc;
-        if ( !wxEndsWithPathSeparator(pc) )
-            strFile += wxFILE_SEP_PATH;
-        strFile += pszFile;
-
-        if ( FileExists(strFile) ) {
-            *pStr = strFile;
-            break;
-        }
+        case FILE_TYPE_CHAR:
+            return wxFILE_KIND_TERMINAL;
+        case FILE_TYPE_DISK:
+            return wxFILE_KIND_DISK;
+        case FILE_TYPE_PIPE:
+            return wxFILE_KIND_PIPE;

     }
 
     }
 

-    // suppress warning about unused variable save_ptr when wxStrtok() is a
-    // macro which throws away its third argument
-    save_ptr = pc;
+    return wxFILE_KIND_UNKNOWN;

 
 

-    delete [] szPath;
+#elif defined(__UNIX__)
+    if (isatty(fd))
+        return wxFILE_KIND_TERMINAL;

 
 

-    return pc != NULL;  // if true => we breaked from the loop
-}
+    struct stat st;
+    fstat(fd, &st);

 
 

-void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
-                             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") );
+    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

 
 

-    wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt);
+    return wxFILE_KIND_DISK;
+
+#else
+    #define wxFILEKIND_STUB
+    (void)fd;
+    return wxFILE_KIND_DISK;
+#endif

 }
 
 }
 

-time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+wxFileKind wxGetFileKind(FILE *fp)

 {
 {

-    wxStructStat buf;
-
-    wxStat(filename.fn_str(), &buf);
-    return buf.st_mtime;
+    // 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

 }
 
 
 }
 
 


@@ -1974,172 +1987,132 @@ time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
 
 bool wxIsWild( const wxString& pattern )
 {
 
 bool wxIsWild( const wxString& pattern )
 {

-  wxString tmp = pattern;
-  wxChar *pat = WXSTRINGCAST(tmp);
-    while (*pat) {
-        switch (*pat++) {
-        case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
-            return TRUE;
-        case wxT('\\'):
-            if (!*pat++)
-                return FALSE;
+    for ( wxString::const_iterator p = pattern.begin(); p != pattern.end(); ++p )
+    {
+        switch ( (*p).GetValue() )
+        {
+            case wxT('?'):
+            case wxT('*'):
+            case wxT('['):
+            case wxT('{'):
+                return true;
+
+            case wxT('\\'):
+                if ( ++p == pattern.end() )
+                    return false;

         }
     }
         }
     }

-    return FALSE;
-};
+    return false;
+}

 
 

-bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
+/*
+* Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
+*
+* The match procedure is public domain code (from ircII's reg.c)
+* but modified to suit our tastes (RN: No "%" syntax I guess)
+*/

 
 

-#if defined(HAVE_FNMATCH_H)
+bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )

 {
 {

-// this probably won't work well for multibyte chars in Unicode mode?
-   if(dot_special)
-      return fnmatch(pat.fn_str(), text.fn_str(), FNM_PERIOD) == 0;
-   else
-      return fnmatch(pat.fn_str(), text.fn_str(), 0) == 0;
-}
-#else
+    if (text.empty())
+    {
+        /* Match if both are empty. */
+        return pat.empty();
+    }

 
 

-// #pragma error Broken implementation of wxMatchWild() -- needs fixing!
-
-   /*
-    * WARNING: this code is broken!
-    */
-{
-  wxString tmp1 = pat;
-  wxChar *pattern = WXSTRINGCAST(tmp1);
-  wxString tmp2 = text;
-  wxChar *str = WXSTRINGCAST(tmp2);
-    wxChar c;
-    wxChar *cp;
-    bool done = FALSE, ret_code, ok;
-    // Below is for vi fans
-    const wxChar OB = wxT('{'), CB = wxT('}');
-
-    // dot_special means '.' only matches '.'
-    if (dot_special && *str == wxT('.') && *pattern != *str)
-        return FALSE;
-
-    while ((*pattern != wxT('\0')) && (!done)
-    && (((*str==wxT('\0'))&&((*pattern==OB)||(*pattern==wxT('*'))))||(*str!=wxT('\0')))) {
-        switch (*pattern) {
-        case wxT('\\'):
-            pattern++;
-            if (*pattern != wxT('\0'))
-                pattern++;
-            break;
-        case wxT('*'):
-            pattern++;
-            ret_code = FALSE;
-            while ((*str!=wxT('\0'))
-            && ((ret_code=wxMatchWild(pattern, str++, FALSE)) == 0))
-                /*loop*/;
-            if (ret_code) {
-                while (*str != wxT('\0'))
-                    str++;
-                while (*pattern != wxT('\0'))
-                    pattern++;
-            }
-            break;
-        case wxT('['):
-            pattern++;
-          repeat:
-            if ((*pattern == wxT('\0')) || (*pattern == wxT(']'))) {
-                done = TRUE;
-                break;
-            }
-            if (*pattern == wxT('\\')) {
-                pattern++;
-                if (*pattern == wxT('\0')) {
-                    done = TRUE;
-                    break;
-                }
-            }
-            if (*(pattern + 1) == wxT('-')) {
-                c = *pattern;
-                pattern += 2;
-                if (*pattern == wxT(']')) {
-                    done = TRUE;
-                    break;
-                }
-                if (*pattern == wxT('\\')) {
-                    pattern++;
-                    if (*pattern == wxT('\0')) {
-                        done = TRUE;
-                        break;
-                    }
-                }
-                if ((*str < c) || (*str > *pattern)) {
-                    pattern++;
-                    goto repeat;
-                }
-            } else if (*pattern != *str) {
-                pattern++;
-                goto repeat;
+    const wxChar *m = pat.c_str(),
+    *n = text.c_str(),
+    *ma = NULL,
+    *na = NULL;
+    int just = 0,
+    acount = 0,
+    count = 0;
+
+    if (dot_special && (*n == wxT('.')))
+    {
+        /* Never match so that hidden Unix files
+         * are never found. */
+        return false;
+    }
+
+    for (;;)
+    {
+        if (*m == wxT('*'))
+        {
+            ma = ++m;
+            na = n;
+            just = 1;
+            acount = count;
+        }
+        else if (*m == wxT('?'))
+        {
+            m++;
+            if (!*n++)
+                return false;
+        }
+        else
+        {
+            if (*m == wxT('\\'))
+            {
+                m++;
+                /* Quoting "nothing" is a bad thing */
+                if (!*m)
+                    return false;

             }
             }

-            pattern++;
-            while ((*pattern != wxT(']')) && (*pattern != wxT('\0'))) {
-                if ((*pattern == wxT('\\')) && (*(pattern + 1) != wxT('\0')))
-                    pattern++;
-                pattern++;
+            if (!*m)
+            {
+                /*
+                * If we are out of both strings or we just
+                * saw a wildcard, then we can say we have a
+                * match
+                */
+                if (!*n)
+                    return true;
+                if (just)
+                    return true;
+                just = 0;
+                goto not_matched;

             }
             }

-            if (*pattern != wxT('\0')) {
-                pattern++, str++;
+            /*
+            * We could check for *n == NULL at this point, but
+            * since it's more common to have a character there,
+            * check to see if they match first (m and n) and
+            * then if they don't match, THEN we can check for
+            * the NULL of n
+            */
+            just = 0;
+            if (*m == *n)
+            {
+                m++;
+                count++;
+                n++;

             }
             }

-            break;
-        case wxT('?'):
-            pattern++;
-            str++;
-            break;
-        case OB:
-            pattern++;
-            while ((*pattern != CB) && (*pattern != wxT('\0'))) {
-                cp = str;
-                ok = TRUE;
-                while (ok && (*cp != wxT('\0')) && (*pattern != wxT('\0'))
-                &&  (*pattern != wxT(',')) && (*pattern != CB)) {
-                    if (*pattern == wxT('\\'))
-                        pattern++;
-                    ok = (*pattern++ == *cp++);
-                }
-                if (*pattern == wxT('\0')) {
-                    ok = FALSE;
-                    done = TRUE;
-                    break;
-                } else if (ok) {
-                    str = cp;
-                    while ((*pattern != CB) && (*pattern != wxT('\0'))) {
-                        if (*++pattern == wxT('\\')) {
-                            if (*++pattern == CB)
-                                pattern++;
-                        }
-                    }
-                } else {
-                    while (*pattern!=CB && *pattern!=wxT(',') && *pattern!=wxT('\0')) {
-                        if (*++pattern == wxT('\\')) {
-                            if (*++pattern == CB || *pattern == wxT(','))
-                                pattern++;
-                        }
-                    }
+            else
+            {
+
+                not_matched:
+
+                /*
+                * If there are no more characters in the
+                * string, but we still need to find another
+                * character (*m != NULL), then it will be
+                * impossible to match it
+                */
+                if (!*n)
+                    return false;
+
+                if (ma)
+                {
+                    m = ma;
+                    n = ++na;
+                    count = acount;

                 }
                 }

-                if (*pattern != wxT('\0'))
-                    pattern++;
-            }
-            break;
-        default:
-            if (*str == *pattern) {
-                str++, pattern++;
-            } else {
-                done = TRUE;
+                else
+                    return false;

             }
         }
     }
             }
         }
     }

-    while (*pattern == wxT('*'))
-        pattern++;
-    return ((*str == wxT('\0')) && (*pattern == wxT('\0')));
-};
-
-#endif
+}

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