restored defaults in switchs removed in the last commit

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 9c79a5d13a0939a44d0f01f0d6549bc4c4821261..c9daf16772c19ce2335b3ee73848bbef22a05149 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

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

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


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "filefn.h"
 #endif
 
     #pragma implementation "filefn.h"
 #endif
 


@@ -31,6 +31,9 @@
 
 #include "wx/utils.h"
 #include "wx/intl.h"
 
 #include "wx/utils.h"
 #include "wx/intl.h"

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

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


@@ -47,35 +50,66 @@
     #endif
 #endif
 
     #endif
 #endif
 

+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+
+#ifdef __WXWINCE__
+#include "wx/msw/wince/time.h"
+#include "wx/msw/private.h"
+#else

 #include <time.h>
 #include <time.h>

+#endif

 
 

-#ifndef __MWERKS__
+#ifdef __WXWINCE__
+// Nothing
+#elif !defined(__MWERKS__)

     #include <sys/types.h>
     #include <sys/stat.h>
     #include <sys/types.h>
     #include <sys/stat.h>

+#else
+#ifdef __MACH__
+#include <sys/types.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <unistd.h>

 #else
     #include <stat.h>
     #include <unistd.h>
 #else
     #include <stat.h>
     #include <unistd.h>

+    #include <unix.h>
+    #include <fcntl.h>

 #endif
 #endif

-
-#ifdef __UNIX__
-    #include <unistd.h>
-    #include <dirent.h>

 #endif
 
 #endif
 

-#ifdef __WXPM__
+#ifdef __OS2__
+// need to check for __OS2__ first since currently both
+// __OS2__ and __UNIX__ are defined.

     #include <process.h>
     #include "wx/os2/private.h"
     #include <process.h>
     #include "wx/os2/private.h"

+#ifdef __EMX__
+    #include <unistd.h>

 #endif
 #endif

-#ifdef __WINDOWS__
-#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
+#elif defined(__UNIX__)
+    #include <unistd.h>
+    #include <dirent.h>
+    #include <fcntl.h>
+#endif
+
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__)

     #include <direct.h>
     #include <dos.h>
     #include <direct.h>
     #include <dos.h>

+    #include <io.h>

 #endif // __WINDOWS__
 #endif // native Win compiler
 
 #endif // __WINDOWS__
 #endif // native Win compiler
 

-#ifdef __GNUWIN32__
-    #ifndef __TWIN32__
-        #include <sys/unistd.h>
+#if defined(__DOS__)
+    #ifdef __WATCOMC__
+        #include <direct.h>
+        #include <dos.h>
+        #include <io.h>
+    #endif
+    #ifdef __DJGPP__
+        #include <unistd.h>

     #endif
 #endif
 
     #endif
 #endif
 


@@ -90,7 +124,6 @@
     #include <unix.h>
 #endif
 
     #include <unix.h>
 #endif
 

-#include "wx/setup.h"

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


@@ -99,31 +132,53 @@
 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__

-    #include "windows.h"
+    #include "wx/msw/wrapwin.h"
+    #include "wx/msw/mslu.h"
+
+    // for _getcwd
+    #ifdef __MINGW32__
+        #include <io.h>
+    #endif
+
+    // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
+    //
+    // note that it must be included after <windows.h>
+    #ifdef __GNUWIN32__
+        #ifdef __CYGWIN__
+            #include <sys/cygwin.h>
+        #endif
+    #endif // __GNUWIN32__
+#endif // __WINDOWS__
+
+// TODO: Borland probably has _wgetcwd as well?
+#ifdef _MSC_VER
+    #define HAVE_WGETCWD

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

-#define _MAXPATHLEN 500
-
-extern wxChar *wxBuffer;
+#ifndef _MAXPATHLEN
+    #define _MAXPATHLEN 1024
+#endif

 
 #ifdef __WXMAC__
 
 #ifdef __WXMAC__

-
-#include "morefile.h"
-#include "moreextr.h"
-#include "fullpath.h"
-#include "fspcompa.h"
+#  ifdef __DARWIN__
+#    include "MoreFilesX.h"
+#  else
+#    include "MoreFiles.h"
+#    include "MoreFilesExtras.h"
+#    include "FullPath.h"
+#    include "FSpCompat.h"
+#  endif

 #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


@@ -134,10 +189,55 @@ static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 const off_t wxInvalidOffset = (off_t)-1;
 #endif
 
 const off_t wxInvalidOffset = (off_t)-1;
 #endif
 

+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// we need to translate Mac filenames before passing them to OS functions
+#define OS_FILENAME(s) (s.fn_str())
+

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

+#ifdef wxNEED_WX_UNISTD_H
+
+WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
+{
+    return stat( wxConvFile.cWX2MB( file_name ), buf );
+}
+
+WXDLLEXPORT int wxAccess( const wxChar *pathname, int mode )
+{
+    return access( wxConvFile.cWX2MB( pathname ), mode );
+}
+
+WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode )
+{
+    return open( wxConvFile.cWX2MB( pathname ), flags, mode );
+}
+
+#endif
+   // wxNEED_WX_UNISTD_H
+
+// ----------------------------------------------------------------------------
+// wxPathList
+// ----------------------------------------------------------------------------
+
+// IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
+
+static inline wxChar* MYcopystring(const wxString& s)
+{
+    wxChar* copy = new wxChar[s.length() + 1];
+    return wxStrcpy(copy, s.c_str());
+}
+
+static inline wxChar* MYcopystring(const wxChar* s)
+{
+    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}
+

 void wxPathList::Add (const wxString& path)
 {
     wxStringList::Add (WXSTRINGCAST path);
 void wxPathList::Add (const wxString& path)
 {
     wxStringList::Add (WXSTRINGCAST path);


@@ -146,35 +246,47 @@ void wxPathList::Add (const wxString& path)
 // Add paths e.g. from the PATH environment variable
 void wxPathList::AddEnvList (const wxString& envVariable)
 {
 // Add paths e.g. from the PATH environment variable
 void wxPathList::AddEnvList (const wxString& 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__
+    static const wxChar PATH_TOKS[] =
+#if defined(__WINDOWS__) || defined(__OS2__)
+        /*
+        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"
+        */
+//        wxT(" ;"); // Don't seperate with colon in DOS (used for drive)
+        wxT(";"); // Don't seperate with colon in DOS (used for drive)

 #else
         wxT(" :;");
 #endif
 
 #else
         wxT(" :;");
 #endif
 

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

     {
     {

-      wxChar *s = copystring (val);
-      wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
+        wxChar *s = MYcopystring (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));
-          }
-      }
+        if (token)
+        {
+            Add(token);
+            while (token)
+            {
+                if ( (token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr))
+                    != NULL )
+                {
+                    Add(token);
+                }
+            }
+        }

 
 

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

 
 

-      delete [] s;
+        delete [] s;

     }
     }

+#endif

 }
 
 // Given a full filename (with path), ensure that that file can
 }
 
 // Given a full filename (with path), ensure that that file can


@@ -192,11 +304,11 @@ void wxPathList::EnsureFileAccessible (const wxString& path)
 
 bool wxPathList::Member (const wxString& path)
 {
 
 bool wxPathList::Member (const wxString& path)
 {

-  for (wxNode * node = First (); node != NULL; node = node->Next ())
+  for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())

   {
   {

-      wxString path2((wxChar *) node->Data ());
+      wxString path2( node->GetData() );

       if (
       if (

-#if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__)
+#if defined(__WINDOWS__) || defined(__OS2__) || defined(__VMS__) || defined (__WXMAC__)

       // Case INDEPENDENT
           path.CompareTo (path2, wxString::ignoreCase) == 0
 #else
       // Case INDEPENDENT
           path.CompareTo (path2, wxString::ignoreCase) == 0
 #else


@@ -217,19 +329,18 @@ wxString wxPathList::FindValidPath (const wxString& file)
   wxChar buf[_MAXPATHLEN];
   wxStrcpy(buf, wxFileFunctionsBuffer);
 
   wxChar buf[_MAXPATHLEN];
   wxStrcpy(buf, wxFileFunctionsBuffer);
 

-  wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
-  filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
+  wxChar *filename = wxIsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;

 
 

-  for (wxNode * node = First (); node; node = node->Next ())
+  for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())

     {
     {

-      wxChar *path = (wxChar *) node->Data ();
+      const wxChar *path = node->GetData();

       wxStrcpy (wxFileFunctionsBuffer, path);
       wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
       if (ch != wxT('\\') && ch != wxT('/'))
         wxStrcat (wxFileFunctionsBuffer, wxT("/"));
       wxStrcat (wxFileFunctionsBuffer, filename);
 #ifdef __WINDOWS__
       wxStrcpy (wxFileFunctionsBuffer, path);
       wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
       if (ch != wxT('\\') && ch != wxT('/'))
         wxStrcat (wxFileFunctionsBuffer, wxT("/"));
       wxStrcat (wxFileFunctionsBuffer, filename);
 #ifdef __WINDOWS__

-      Unix2DosFilename (wxFileFunctionsBuffer);
+      wxUnix2DosFilename (wxFileFunctionsBuffer);

 #endif
       if (wxFileExists (wxFileFunctionsBuffer))
       {
 #endif
       if (wxFileExists (wxFileFunctionsBuffer))
       {


@@ -237,7 +348,7 @@ wxString wxPathList::FindValidPath (const wxString& file)
       }
     }                                // for()
 
       }
     }                                // for()
 

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

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


@@ -247,8 +358,8 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
         return f;
 
     wxString buf;
         return f;
 
     wxString buf;

-    wxGetWorkingDirectory(buf.GetWriteBuf(_MAXPATHLEN), _MAXPATHLEN - 1);
-    buf.UngetWriteBuf();
+    wxGetWorkingDirectory(wxStringBuffer(buf, _MAXPATHLEN), _MAXPATHLEN);
+

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


@@ -261,55 +372,48 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
 bool
 wxFileExists (const wxString& filename)
 {
 bool
 wxFileExists (const wxString& filename)
 {

-#ifdef __GNUWIN32__ // (fix a B20 bug)
-  if (GetFileAttributes(filename) == 0xFFFFFFFF)
-    return FALSE;
-  else
-    return TRUE;
-#elif defined(__WXMAC__)
-          struct stat stbuf;
-        if (filename && stat (wxUnix2MacFilename(filename), &stbuf) == 0 )
-          return TRUE;
-    return FALSE ;
-#else
-
-  wxStructStat stbuf;
-  if ((filename != wxT("")) && wxStat (wxFNSTRINGCAST filename.fn_str(), &stbuf) == 0)
-    return TRUE;
-
-  return FALSE;
-#endif
-}
-
-/* Vadim's alternative implementation
+    // we must use GetFileAttributes() instead of the ANSI C functions because
+    // it can cope with network (UNC) paths unlike them
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    DWORD ret = ::GetFileAttributes(filename);

 
 

-// does the file exist?
-bool wxFileExists(const char *pszFileName)
-{
-  struct stat st;
-  return !access(pszFileName, 0) &&
-         !stat(pszFileName, &st) &&
-         (st.st_mode & S_IFREG);
+    return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
+#else // !__WIN32__
+    wxStructStat st;
+    return wxStat(filename, &st) == 0 && (st.st_mode & S_IFREG);
+#endif // __WIN32__/!__WIN32__

 }
 }

-*/

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

-  if (filename != wxT(""))
+    if (filename != wxT(""))

     {
     {

-      if (filename[0] == wxT('/')
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+        // Classic or Carbon CodeWarrior like
+        // Carbon with Apple DevTools is Unix like
+
+        // This seems wrong to me, but there is no fix. since
+        // "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
+        // is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.
+        if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
+            return TRUE ;
+#else
+        // Unix like or Windows
+        if (filename[0] == wxT('/'))
+            return TRUE;
+#endif

 #ifdef __VMS__
 #ifdef __VMS__

-      || (filename[0] == wxT('[') && filename[1] != wxT('.'))
+        if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
+            return TRUE;

 #endif
 #endif

-#ifdef __WINDOWS__
-      /* MSDOS */
-      || filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':'))
+#if defined(__WINDOWS__) || defined(__OS2__)
+        // MSDOS like
+        if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
+            return TRUE;

 #endif
 #endif

-        )
-        return TRUE;

     }
     }

-  return FALSE;
+    return FALSE ;

 }
 
 /*
 }
 
 /*


@@ -353,7 +457,7 @@ wxChar *wxRealPath (wxChar *path)
 {
 #ifdef __WXMSW__
   static const wxChar SEP = wxT('\\');
 {
 #ifdef __WXMSW__
   static const wxChar SEP = wxT('\\');

-  Unix2DosFilename(path);
+  wxUnix2DosFilename(path);

 #else
   static const wxChar SEP = wxT('/');
 #endif
 #else
   static const wxChar SEP = wxT('/');
 #endif


@@ -371,7 +475,11 @@ wxChar *wxRealPath (wxChar *path)
             if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
               {
                 wxChar *q;
             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--);
+                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))
                   {


@@ -381,7 +489,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,7 +514,7 @@ wxChar *wxCopyAbsolutePath(const wxString& filename)
   if (filename == wxT(""))
     return (wxChar *) NULL;
 
   if (filename == wxT(""))
     return (wxChar *) NULL;
 

-  if (! IsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
+  if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {

     wxChar  buf[_MAXPATHLEN];
     buf[0] = wxT('\0');
     wxGetWorkingDirectory(buf, WXSIZEOF(buf));
     wxChar  buf[_MAXPATHLEN];
     buf[0] = wxT('\0');
     wxGetWorkingDirectory(buf, WXSIZEOF(buf));


@@ -419,9 +527,9 @@ wxChar *wxCopyAbsolutePath(const wxString& filename)
         wxStrcat(buf, wxT("/"));
 #endif
     wxStrcat(buf, wxFileFunctionsBuffer);
         wxStrcat(buf, wxT("/"));
 #endif
     wxStrcat(buf, wxFileFunctionsBuffer);

-    return copystring( wxRealPath(buf) );
+    return MYcopystring( wxRealPath(buf) );

   }
   }

-  return copystring( wxFileFunctionsBuffer );
+  return MYcopystring( wxFileFunctionsBuffer );

 }
 
 /*-
 }
 
 /*-


@@ -451,7 +559,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
 {
     register wxChar *d, *s, *nm;
     wxChar          lnm[_MAXPATHLEN];
 {
     register wxChar *d, *s, *nm;
     wxChar          lnm[_MAXPATHLEN];

-    int                                q;
+    int             q;

 
     // Some compilers don't like this line.
 //    const wxChar    trimchars[] = wxT("\n \t");
 
     // Some compilers don't like this line.
 //    const wxChar    trimchars[] = wxT("\n \t");


@@ -470,7 +578,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     buf[0] = wxT('\0');
     if (name == NULL || *name == wxT('\0'))
         return buf;
     buf[0] = wxT('\0');
     if (name == NULL || *name == wxT('\0'))
         return buf;

-    nm = copystring(name); // Make a scratch copy
+    nm = MYcopystring(name); // Make a scratch copy

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


@@ -507,7 +615,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
       }
       else
 #else
       }
       else
 #else

-    while ((*d++ = *s)) {
+    while ((*d++ = *s) != 0) {

 #  ifndef __WXMSW__
         if (*s == wxT('\\')) {
             if ((*(d - 1) = *++s)) {
 #  ifndef __WXMSW__
         if (*s == wxT('\\')) {
             if ((*(d - 1) = *++s)) {


@@ -518,6 +626,8 @@ 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
 #ifdef __WXMSW__
         if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
 #else


@@ -527,13 +637,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             register wxChar  *start = d;
             register int     braces = (*s == wxT('{') || *s == wxT('('));
             register wxChar  *value;
             register wxChar  *start = d;
             register int     braces = (*s == wxT('{') || *s == wxT('('));
             register wxChar  *value;

-#ifdef __VISAGECPP__
-    // VA gives assignment in logical expr warning
-            while (*d)
-               *d++ = *s;
-#else
-            while ((*d++ = *s))
-#endif
+            while ((*d++ = *s) != 0)

                 if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
                     break;
                 else
                 if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
                     break;
                 else


@@ -541,22 +645,22 @@ 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) {

-#ifdef __VISAGECPP__
-    // VA gives assignment in logical expr warning
-                for ((d = start - 1); (*d); *d++ = *value++);
-#else
-                for ((d = start - 1); (*d++ = *value++););
-#endif
+                for ((d = start - 1); (*d++ = *value++) != 0;)
+                {
+                    // Empty
+                }
+

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

+#endif
+        // __WXWINCE__

     }
 
     /* Expand ~ and ~user */
     nm = lnm;
     }
 
     /* Expand ~ and ~user */
     nm = lnm;

-    s = wxT("");

     if (nm[0] == wxT('~') && !q)
     {
         /* prefix ~ */
     if (nm[0] == wxT('~') && !q)
     {
         /* prefix ~ */


@@ -571,7 +675,10 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
         {                /* ~user/filename */
             register wxChar  *nnm;
             register wxChar  *home;
         {                /* ~user/filename */
             register wxChar  *nnm;
             register wxChar  *home;

-            for (s = nm; *s && *s != SEP; s++);
+            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;
             int was_sep; /* MATTHEW: Was there a separator, or NULL? */
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;


@@ -580,7 +687,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) {
                if (was_sep) /* replace only if it was there: */
                    *s = SEP;
             if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) {
                if (was_sep) /* replace only if it was there: */
                    *s = SEP;

-                s = wxT("");
+                s = NULL;

             } else {
                 nm = nnm;
                 s = home;
             } else {
                 nm = nnm;
                 s = home;


@@ -598,13 +705,10 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
           *(d - 1) = SEP;
     }
     s = nm;
           *(d - 1) = SEP;
     }
     s = nm;

-#ifdef __VISAGECPP__
-    // VA gives assignment in logical expr warning
-    while (*d)
-       *d++ = *s++;
-#else
-    while ((*d++ = *s++));
-#endif
+    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);


@@ -627,12 +731,13 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
 
   wxStrcpy (dest, WXSTRINGCAST filename);
 #ifdef __WXMSW__
 
   wxStrcpy (dest, WXSTRINGCAST filename);
 #ifdef __WXMSW__

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

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

-  const wxChar *val = (const wxChar *) NULL;
-  wxChar *tcp = (wxChar *) NULL;
+  const wxChar *val;
+#ifndef __WXWINCE__
+  wxChar *tcp;

   if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
      (tcp = wxStrstr (dest, val)) != NULL)
     {
   if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
      (tcp = wxStrstr (dest, val)) != NULL)
     {


@@ -643,9 +748,10 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
         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;
+  size_t len;

   if ((val = wxGetUserHome (user)) != NULL &&
       (len = wxStrlen(val)) > 2 &&
       wxStrncmp(dest, val, len) == 0)
   if ((val = wxGetUserHome (user)) != NULL &&
       (len = wxStrlen(val)) > 2 &&
       wxStrncmp(dest, val, len) == 0)


@@ -653,11 +759,6 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
       wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
       if (user != wxT(""))
              wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
       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);
     }
       wxStrcat(wxFileFunctionsBuffer, dest + len);
       wxStrcpy (dest, wxFileFunctionsBuffer);
     }


@@ -665,320 +766,394 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
   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;
+    wxString p = path;
+    wxString n = wxFileNameFromPath(p);

 
 

-      tcp = path + wxStrlen (path);
-      while (--tcp >= path)
-        {
-          if (*tcp == wxT('/') || *tcp == wxT('\\')
-#ifdef __VMS__
-     || *tcp == wxT(':') || *tcp == wxT(']'))
-#else
-     )
-#endif
-            return tcp + 1;
-        }                        /* while */
-#if defined(__WXMSW__) || defined(__WXPM__)
-      if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
-        return path + 2;
-#endif
-    }
-  return path;
+    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);

 
 

-      wxChar *path = WXSTRINGCAST path1 ;
-      register wxChar *tcp;
-
-      tcp = path + wxStrlen (path);
-      while (--tcp >= path)
-          {
-            if (*tcp == wxT('/') || *tcp == wxT('\\')
-#ifdef __VMS__
-        || *tcp == wxT(':') || *tcp == wxT(']'))
-#else
-        )
-#endif
-                return wxString(tcp + 1);
-            }                        /* while */
-#if defined(__WXMSW__) || defined(__WXPM__)
-      if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
-            return wxString(path + 2);
-#endif
+    wxString fullname = name;
+    if ( !ext.empty() )
+    {
+        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
 wxChar *
 wxPathOnly (wxChar *path)
 {
 }
 
 // Return just the directory, or NULL if no directory
 wxChar *
 wxPathOnly (wxChar *path)
 {

-  if (path && *path)
+    if (path && *path)

     {
     {

-      static wxChar buf[_MAXPATHLEN];
-
-      // Local copy
-      wxStrcpy (buf, path);
+        static wxChar buf[_MAXPATHLEN];

 
 

-      int l = wxStrlen(path);
-      bool done = FALSE;
+        // Local copy
+        wxStrcpy (buf, path);

 
 

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

 
 

-      // Search backward for a backward or forward slash
-      while (!done && i > -1)
-      {
-        // ] is for VMS
-        if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
+        // Search backward for a backward or forward slash
+        while (i > -1)

         {
         {

-          done = TRUE;
-#ifdef __VMS__
-          buf[i+1] = 0;
+#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
 #else

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

 #endif
 #endif

-
-          return buf;
+#ifdef __VMS__
+            if (path[i] == wxT(']'))
+            {
+                buf[i+1] = 0;
+                return buf;
+            }
+#endif
+            i --;

         }
         }

-        else i --;
-      }

 
 

-#if defined(__WXMSW__) || defined(__WXPM__)
-      // Try Drive specifier
-      if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
+#if defined(__WXMSW__) || defined(__OS2__)
+        // Try Drive specifier
+        if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))

         {
         {

-          // A:junk --> A:. (since A:.\junk Not A:\junk)
-          buf[2] = wxT('.');
-          buf[3] = wxT('\0');
-          return buf;
+            // A:junk --> A:. (since A:.\junk Not A:\junk)
+            buf[2] = wxT('.');
+            buf[3] = wxT('\0');
+            return buf;

         }
 #endif
     }
         }
 #endif
     }

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

 }
 
 // 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 != wxT(""))

     {
     {

-      wxChar buf[_MAXPATHLEN];
+        wxChar buf[_MAXPATHLEN];

 
 

-      // Local copy
-      wxStrcpy (buf, WXSTRINGCAST path);
+        // Local copy
+        wxStrcpy (buf, WXSTRINGCAST path);

 
 

-      int l = path.Length();
-      bool done = FALSE;
+        int l = path.Length();
+        int i = l - 1;

 
 

-      int i = l - 1;
-
-      // Search backward for a backward or forward slash
-      while (!done && i > -1)
-      {
-        // ] is for VMS
-        if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
+        // Search backward for a backward or forward slash
+        while (i > -1)

         {
         {

-          done = TRUE;
-#ifdef __VMS__
-          buf[i+1] = 0;
+#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
 #else

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

 #endif
 #endif

-
-          return wxString(buf);
+#ifdef __VMS__
+            if (path[i] == wxT(']'))
+            {
+                buf[i+1] = 0;
+                return wxString(buf);
+            }
+#endif
+            i --;

         }
         }

-        else i --;
-      }

 
 

-#if defined(__WXMSW__) || defined(__WXPM__)
-      // Try Drive specifier
-      if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
+#if defined(__WXMSW__) || defined(__OS2__)
+        // Try Drive specifier
+        if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))

         {
         {

-          // A:junk --> A:. (since A:.\junk Not A:\junk)
-          buf[2] = wxT('.');
-          buf[3] = wxT('\0');
-          return wxString(buf);
+            // A:junk --> A:. (since A:.\junk Not A:\junk)
+            buf[2] = wxT('.');
+            buf[3] = wxT('\0');
+            return wxString(buf);

         }
 #endif
     }
         }
 #endif
     }

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

 }
 
 // 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.
 

-#ifdef __WXMAC__
-
-static char sMacFileNameConversion[ 1000 ] ;
-
-wxString wxMac2UnixFilename (const char *str)
+#if defined(__WXMAC__)
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )

 {
 {

-    char *s = sMacFileNameConversion ;
-    strcpy( s , str ) ;
-  if (s)
-  {
-    memmove( s+1 , s ,strlen( s ) + 1) ;
-    if ( *s == ':' )
-            *s = '.' ;
-    else
-            *s = '/' ;
-
-    while (*s)
-    {
-            if (*s == ':')
-              *s = '/';
-            else
-              *s = wxTolower (*s);        // Case INDEPENDENT
-            s++;
+#ifdef __DARWIN__
+    int         i;
+    int         j;
+    OSErr       theErr;
+    OSStatus    theStatus = noErr;
+    Boolean     isDirectory = FALSE;
+    Str255    theParentPath = "\p";
+    FSSpec      theParentSpec;
+    FSRef       theParentRef;
+    char        theFileName[FILENAME_MAX];
+    char        thePath[FILENAME_MAX];
+
+    strcpy(thePath, "");
+
+    // GD: Separate file name from path and make a FSRef to the parent
+    //     directory. This is necessary since FSRefs cannot reference files
+    //     that have not yet been created.
+    //     Based on example code from Apple Technical Note TN2022
+    //       http://developer.apple.com/technotes/tn/tn2022.html
+
+    // check whether we are converting a directory
+    isDirectory = ((spec->name)[spec->name[0]] == ':');
+    // count length of file name
+    for (i = spec->name[0] - (isDirectory ? 1 : 0); ((spec->name[i] != ':') && (i > 0)); i--);
+    // copy file name
+    //   prepend path separator since it will later be appended to the path
+    theFileName[0] = wxFILE_SEP_PATH;
+    for (j = i + 1; j <= spec->name[0] - (isDirectory ? 1 : 0); j++) {
+        theFileName[j - i] = spec->name[j];

     }
     }

-  }
-  return wxString (sMacFileNameConversion) ;
-}
-
-wxString wxUnix2MacFilename (const char *str)
-{
-    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 ) ) ;
+    theFileName[j - i] = '\0';
+    // copy path if any
+    for (j = 1; j <= i; j++) {
+        theParentPath[++theParentPath[0]] = spec->name[j];

     }
     }

-    else if ( *s == '/' )
-    {
-      // absolute path -> on mac just start with the drive name
-      memmove( s , s+1 ,strlen( s ) ) ;
+    theErr = FSMakeFSSpec(spec->vRefNum, spec->parID, theParentPath, &theParentSpec);
+    if (theErr == noErr) {
+        // convert the FSSpec to an FSRef
+        theErr = FSpMakeFSRef(&theParentSpec, &theParentRef);

     }
     }

-    else
-    {
-      wxASSERT_MSG( 1 , "unkown path beginning" ) ;
+    if (theErr == noErr) {
+        // get the POSIX path associated with the FSRef
+        theStatus = FSRefMakePath(&theParentRef,
+                                  (UInt8 *)thePath, sizeof(thePath));

     }
     }

-    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++ ;
+    if (theStatus == noErr) {
+        // append file name to path
+        //   includes previously prepended path separator
+        strcat(thePath, theFileName);

     }
     }

-  }
-  return wxString (sMacFileNameConversion) ;
-}

 
 

-wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
-{
+    // create path string for return value
+    wxString result( thePath , wxConvLocal) ;
+#else

     Handle    myPath ;
     short     length ;
 
     Handle    myPath ;
     short     length ;
 

+    // get length of path and allocate handle

     FSpGetFullPath( spec , &length , &myPath ) ;
     ::SetHandleSize( myPath , length + 1 ) ;
     ::HLock( myPath ) ;
     (*myPath)[length] = 0 ;
     FSpGetFullPath( spec , &length , &myPath ) ;
     ::SetHandleSize( myPath , length + 1 ) ;
     ::HLock( myPath ) ;
     (*myPath)[length] = 0 ;

-    if ( length > 0 && (*myPath)[length-1] ==':' )
+    if ((length > 0) && ((*myPath)[length-1] == ':'))

         (*myPath)[length-1] = 0 ;
 
         (*myPath)[length-1] = 0 ;
 

-    wxString result(     (char*) *myPath ) ;
+    // create path string for return value
+    wxString result( *myPath , wxConvLocal) ;
+
+    // free allocated handle

     ::HUnlock( myPath ) ;
     ::DisposeHandle( myPath ) ;
     ::HUnlock( myPath ) ;
     ::DisposeHandle( myPath ) ;

+#endif
+

     return result ;
 }
     return result ;
 }

+#ifndef __DARWIN__
+// Mac file names are POSIX (Unix style) under Darwin
+// therefore the conversion functions below are not needed

 
 

-wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
-{
-    return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
-}
+static wxChar sMacFileNameConversion[ 1000 ] ;
+static char scMacFileNameConversion[ 1000 ] ;

 
 

+#endif

 void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
 {
 void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
 {

-    FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
+    OSStatus err = noErr ;
+#ifdef __DARWIN__
+    FSRef theRef;
+
+    // get the FSRef associated with the POSIX path
+    err = FSPathMakeRef((const UInt8 *) path, &theRef, NULL);
+    // convert the FSRef to an FSSpec
+    err = FSGetCatalogInfo(&theRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
+#else
+    if ( strchr( path , ':' ) == NULL )
+    {
+        // try whether it is a volume / or a mounted volume
+        strncpy( scMacFileNameConversion , path , 1000 ) ;
+        scMacFileNameConversion[998] = 0 ;
+        strcat( scMacFileNameConversion , ":" ) ;
+        err = FSpLocationFromFullPath( strlen(scMacFileNameConversion) , scMacFileNameConversion , spec ) ;
+    }
+    else
+    {
+        err = FSpLocationFromFullPath( strlen(path) , path , spec ) ;
+    }
+#endif

 }
 
 }
 

-void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
+#if wxUSE_UNICODE
+WXDLLEXPORT void wxMacFilename2FSSpec( const wxChar *path , FSSpec *spec ) 

 {
 {

-    wxString var = wxUnix2MacFilename( path ) ;
-    wxMacFilename2FSSpec( var , spec ) ;
+    return wxMacFilename2FSSpec( wxConvFile.cWC2MB(path) , spec ) ;

 }
 }

-

 #endif
 #endif

-void
-wxDos2UnixFilename (char *s)
+
+#ifndef __DARWIN__
+
+wxString wxMac2UnixFilename (const wxChar *str)

 {
 {

-  if (s)
-    while (*s)
-      {
-        if (*s == '\\')
-          *s = '/';
-#ifdef __WXMSW__
+    wxChar *s = sMacFileNameConversion ;
+    wxStrcpy( s , str ) ;
+    if (s)
+    {
+        memmove( s+1 , s ,wxStrlen( s ) + 1 * sizeof(wxChar)) ;
+        if ( *s == ':' )
+            *s = '.' ;

         else
         else

-          *s = wxTolower (*s);        // Case INDEPENDENT
-#endif
-        s++;
-      }
-}
+            *s = '/' ;

 
 

-void
-#if defined(__WXMSW__) || defined(__WXPM__)
-wxUnix2DosFilename (wxChar *s)
-#else
-wxUnix2DosFilename (wxChar *WXUNUSED(s) )
-#endif
-{
-// Yes, I really mean this to happen under DOS only! JACS
-#if defined(__WXMSW__) || defined(__WXPM__)
-  if (s)
-    while (*s)
-      {
-        if (*s == wxT('/'))
-          *s = wxT('\\');
-        s++;
-      }
-#endif
+        while (*s)
+        {
+            if (*s == ':')
+                *s = '/';
+            else
+                *s = wxTolower(*s);        // Case INDEPENDENT
+            s++;
+        }
+    }
+    return wxString(sMacFileNameConversion) ;

 }
 
 }
 

-// Concatenate two files to form third
+wxString wxUnix2MacFilename (const wxChar *str)
+{
+    wxChar *s = sMacFileNameConversion ;
+    wxStrcpy( s , str ) ;
+    if (s)
+    {
+        if ( *s == '.' )
+        {
+            // relative path , since it goes on with slash which is translated to a :
+            memmove( s , s+1 ,wxStrlen( s ) * sizeof(wxChar)) ;
+        }
+        else if ( *s == '/' )
+        {
+            // absolute path -> on mac just start with the drive name
+            memmove( s , s+1 ,wxStrlen( s ) * sizeof(wxChar) ) ;
+        }
+        else
+        {
+            wxASSERT_MSG( 1 , wxT("unkown path beginning") ) ;
+        }
+        while (*s)
+        {
+            if (*s == '/' || *s == '\\')
+            {
+                // convert any back-directory situations
+                if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) )
+                {
+                    *s = ':';
+                    memmove( s+1 , s+3 ,(wxStrlen( s+3 ) + 1)*sizeof(wxChar) ) ;
+                }
+                else
+                    *s = ':';
+            }
+            s++ ;
+        }
+    }
+    return wxString(sMacFileNameConversion) ;
+}
+
+wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
+{
+    return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
+}
+
+void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
+{
+    wxString var = wxUnix2MacFilename( path ) ;
+    wxMacFilename2FSSpec( var , spec ) ;
+}
+#endif // ! __DARWIN__
+
+#endif // __WXMAC__
+
+void
+wxDos2UnixFilename (wxChar *s)
+{
+  if (s)
+    while (*s)
+      {
+        if (*s == _T('\\'))
+          *s = _T('/');
+#ifdef __WXMSW__
+        else
+          *s = wxTolower (*s);        // Case INDEPENDENT
+#endif
+        s++;
+      }
+}
+
+void
+#if defined(__WXMSW__) || defined(__OS2__)
+wxUnix2DosFilename (wxChar *s)
+#else
+wxUnix2DosFilename (wxChar *WXUNUSED(s) )
+#endif
+{
+// Yes, I really mean this to happen under DOS only! JACS
+#if defined(__WXMSW__) || defined(__OS2__)
+  if (s)
+    while (*s)
+      {
+        if (*s == wxT('/'))
+          *s = wxT('\\');
+        s++;
+      }
+#endif
+}
+
+// Concatenate two files to form third

 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {

-  wxChar *outfile = wxGetTempFileName("cat");
+  wxString outfile;
+  if ( !wxGetTempFileName( wxT("cat"), outfile) )
+      return FALSE;

 
 

-  FILE *fp1 = (FILE *) NULL;
-  FILE *fp2 = (FILE *) NULL;
-  FILE *fp3 = (FILE *) NULL;
+  FILE *fp1 wxDUMMY_INITIALIZE(NULL);
+  FILE *fp2 = NULL;
+  FILE *fp3 = NULL;

   // Open the inputs and outputs
   // Open the inputs and outputs

-#ifdef __WXMAC__
-  if ((fp1 = fopen (wxUnix2MacFilename( file1 ), "rb")) == NULL ||
-      (fp2 = fopen (wxUnix2MacFilename( file2 ), "rb")) == NULL ||
-      (fp3 = fopen (wxUnix2MacFilename( outfile ), "wb")) == NULL)
-#else
-  if ((fp1 = wxFopen (WXSTRINGCAST file1, wxT("rb"))) == NULL ||
-      (fp2 = wxFopen (WXSTRINGCAST file2, wxT("rb"))) == NULL ||
-      (fp3 = wxFopen (outfile, wxT("wb"))) == NULL)
-#endif
+  if ((fp1 = wxFopen ( file1, wxT("rb"))) == NULL ||
+      (fp2 = wxFopen ( file2, wxT("rb"))) == NULL ||
+      (fp3 = wxFopen ( outfile, wxT("wb"))) == NULL)

     {
       if (fp1)
         fclose (fp1);
     {
       if (fp1)
         fclose (fp1);


@@ -1000,51 +1175,120 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
 
   fclose (fp3);
   bool result = wxRenameFile(outfile, file3);
 
   fclose (fp3);
   bool result = wxRenameFile(outfile, file3);

-  delete[] outfile;

   return result;
 }
 
 // Copy files
 bool
   return result;
 }
 
 // Copy files
 bool

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

 {
 {

-  FILE *fd1;
-  FILE *fd2;
-  int ch;
+#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
+    if ( !::CopyFile(file1, file2, !overwrite) )
+    {
+        wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
+                      file1.c_str(), file2.c_str());

 
 

-#ifdef __WXMAC__
-  if ((fd1 = fopen (wxUnix2MacFilename( file1 ), "rb")) == NULL)
-    return FALSE;
-  if ((fd2 = fopen (wxUnix2MacFilename( file2 ), "wb")) == NULL)
-#else
-  if ((fd1 = wxFopen (WXSTRINGCAST file1, wxT("rb"))) == NULL)
-    return FALSE;
-  if ((fd2 = wxFopen (WXSTRINGCAST file2, wxT("wb"))) == NULL)
-#endif
+        return FALSE;
+    }
+#elif defined(__OS2__)
+    if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )
+        return FALSE;
+#else // !Win32
+
+    wxStructStat fbuf;
+    // get permissions of file1
+    if ( wxStat( file1.c_str(), &fbuf) != 0 )

     {
     {

-      fclose (fd1);
-      return FALSE;
+        // 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;
+    }
+
+    // open file1 for reading
+    wxFile fileIn(file1, wxFile::read);
+    if ( !fileIn.IsOpened() )
+        return FALSE;
+
+    // remove file2, if it exists. This is needed for creating
+    // file2 with the correct permissions in the next step
+    if ( wxFileExists(file2)  && (!overwrite || !wxRemoveFile(file2)))
+    {
+        wxLogSysError(_("Impossible to overwrite the file '%s'"),
+                      file2.c_str());
+        return FALSE;

     }
 
     }
 

-  while ((ch = getc (fd1)) != EOF)
-    (void) putc (ch, fd2);
+#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__
+
+    // 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__
+
+    // copy contents of file1 to file2
+    char buf[4096];
+    size_t count;
+    for ( ;; )
+    {
+        count = fileIn.Read(buf, WXSIZEOF(buf));
+        if ( fileIn.Error() )
+            return FALSE;

 
 

-  fclose (fd1);
-  fclose (fd2);
-  return TRUE;
+        // end of file?
+        if ( !count )
+            break;
+
+        if ( fileOut.Write(buf, count) < 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
+    if ( !fileIn.Close() || !fileOut.Close() )
+        return FALSE;
+
+#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
+    // no chmod in VA.  Should be some permission API for HPFS386 partitions
+    // however
+    if ( chmod(OS_FILENAME(file2), fbuf.st_mode) != 0 )
+    {
+        wxLogSysError(_("Impossible to set permissions for the file '%s'"),
+                      file2.c_str());
+        return FALSE;
+    }
+#endif // OS/2 || Mac
+#endif // __WXMSW__ && __WIN32__
+
+    return TRUE;

 }
 
 bool
 wxRenameFile (const wxString& file1, const wxString& file2)
 {
 }
 
 bool
 wxRenameFile (const wxString& file1, const wxString& file2)
 {

-#ifdef __WXMAC__
-  if (0 == rename (wxUnix2MacFilename( file1 ), wxUnix2MacFilename( file2 )))
-    return TRUE;
-#else
-  // Normal system call
-  if (0 == wxRename (wxCSTRINGCAST file1, wxCSTRINGCAST file2))
+#ifndef __WXWINCE__
+    // Normal system call
+  if ( wxRename (file1, file2) == 0 )

     return TRUE;
 #endif
     return TRUE;
 #endif

+

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


@@ -1056,31 +1300,54 @@ wxRenameFile (const wxString& file1, const wxString& file2)
 
 bool wxRemoveFile(const wxString& file)
 {
 
 bool wxRemoveFile(const wxString& file)
 {

-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
-  int flag = wxRemove(file);
-#elif defined( __WXMAC__ )
-  int flag = unlink(wxUnix2MacFilename( file ));
+#if defined(__VISUALC__) \
+ || defined(__BORLANDC__) \
+ || defined(__WATCOMC__) \
+ || defined(__DMC__) \
+ || defined(__GNUWIN32__)
+  int res = wxRemove(file);
+#elif defined(__WXMAC__)
+  int res = unlink(wxFNCONV(file));

 #else
 #else

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

 #endif
 #endif

-  return (flag == 0) ;
+
+  return res == 0;

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

-#if defined( __WXMAC__ )
-  return (mkdir(wxUnix2MacFilename( dir ) , 0 ) == 0);
+#if defined(__WXMAC__) && !defined(__UNIX__)
+  return (mkdir( wxFNCONV(dir) , 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__)
+#if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
+  #ifndef MSVCRT

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

-#elif defined(__WXPM__)
+  #else
+    if ( mkdir(wxFNCONV(dirname)) != 0 )
+  #endif
+#elif defined(__OS2__)

     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 )
+  #elif defined(__DJGPP__)
+    if ( mkdir(wxFNCONV(dirname), perm) != 0 )
+  #else
+    #error "Unsupported DOS compiler!"
+  #endif
+#else  // !MSW, !DOS and !OS/2 VAC++
+    (void)perm;
+#ifdef __WXWINCE__
+    if ( !CreateDirectory(dirname, NULL) )
+#else

     if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
     if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )

+#endif

 #endif // !MSW/MSW
     {
         wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
 #endif // !MSW/MSW
     {
         wxLogSysError(_("Directory '%s' couldn't be created"), dirname);


@@ -1095,668 +1362,332 @@ bool wxMkdir(const wxString& dir, int perm)
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #ifdef __VMS__
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #ifdef __VMS__

-  return FALSE; //to be changed since rmdir exists in VMS7.x
-#elif defined( __WXMAC__ )
-  return (rmdir(wxUnix2MacFilename( dir )) == 0);
-#elif defined(__WXPM__)
-  return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
-#else
-
-#ifdef __SALFORDC__
-  return FALSE; // What to do?
+    return FALSE; //to be changed since rmdir exists in VMS7.x
+#elif defined(__OS2__)
+    return (::DosDeleteDir((PSZ)dir.c_str()) == 0);

 #else
 #else

-  return (wxRmDir(wxFNSTRINGCAST dir.fn_str()) == 0);
-#endif

 
 

-#endif
-}
-
-#if 0
-bool wxDirExists(const wxString& dir)
-{
-#ifdef __VMS__
-  return FALSE; //To be changed since stat exists in VMS7.x
-#elif !defined(__WXMSW__)
-  struct stat sbuf;
-  return (stat(dir.fn_str(), &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE;
+#ifdef __WXWINCE__
+    return (CreateDirectory(dir, NULL) != 0);

 #else
 #else

-
-  /* MATTHEW: [6] Always use same code for Win32, call FindClose */
-#if defined(__WIN32__)
-  WIN32_FIND_DATA fileInfo;
-#else
-#ifdef __BORLANDC__
-  struct ffblk fileInfo;
-#else
-  struct find_t fileInfo;
-#endif
-#endif
-
-#if defined(__WIN32__)
-        HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo);
-
-        if (h==INVALID_HANDLE_VALUE)
-         return FALSE;
-        else {
-         FindClose(h);
-         return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY);
-        }
-#else
-  // In Borland findfirst has a different argument
-  // ordering from _dos_findfirst. But _dos_findfirst
-  // _should_ be ok in both MS and Borland... why not?
-#ifdef __BORLANDC__
-  return ((findfirst(WXSTRINGCAST dir, &fileInfo, _A_SUBDIR) == 0  && (fileInfo.ff_attrib & _A_SUBDIR) != 0));
-#else
-  return (((_dos_findfirst(WXSTRINGCAST dir, _A_SUBDIR, &fileInfo) == 0) && (fileInfo.attrib & _A_SUBDIR)) != 0);
-#endif
+    return (wxRmDir(OS_FILENAME(dir)) == 0);

 #endif
 
 #endif
 }
 
 #endif
 
 #endif
 }
 

-#endif
-

 // does the path exists? (may have or not '/' or '\\' at the end)
 bool wxPathExists(const wxChar *pszPathName)
 {
     wxString strPath(pszPathName);
 // does the path exists? (may have or not '/' or '\\' at the end)
 bool wxPathExists(const wxChar *pszPathName)
 {
     wxString strPath(pszPathName);

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

     // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
     // so remove all trailing backslashes from the path - but don't do this for
     // the pathes "d:\" (which are different from "d:") nor for just "\"
     while ( wxEndsWithPathSeparator(strPath) )
     {
         size_t len = strPath.length();
     // 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 "\"
     while ( wxEndsWithPathSeparator(strPath) )
     {
         size_t len = strPath.length();

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

             break;
 
         strPath.Truncate(len - 1);
     }
 #endif // __WINDOWS__
 
             break;
 
         strPath.Truncate(len - 1);
     }
 #endif // __WINDOWS__
 

+#ifdef __OS2__
+    // OS/2 can't handle "d:", it wants either "d:\" or "d:."
+    if (strPath.length() == 2 && strPath[1u] == _T(':'))
+        strPath << _T('.');
+#endif
+
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    // stat() can't cope with network paths
+    DWORD ret = ::GetFileAttributes(strPath);
+
+    return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
+#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(pszPathName, &st) == 0 && (st.st_mode == S_IFDIR);

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

-#ifdef __WINDOWS__
+    wxString filename = wxFileName::CreateTempFileName(prefix);
+    if ( filename.empty() )
+        return NULL;

 
 

-#ifndef        __WIN32__
-  wxChar tmp[144];
-  ::GetTempFileName(0, WXSTRINGCAST prefix, 0, tmp);
-#else
-  wxChar tmp[MAX_PATH];
-  wxChar tmpPath[MAX_PATH];
-  ::GetTempPath(MAX_PATH, tmpPath);
-  ::GetTempFileName(tmpPath, WXSTRINGCAST prefix, 0, tmp);
-#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
+    if ( buf )
+        wxStrcpy(buf, filename);
+    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;
-}
+    buf = wxFileName::CreateTempFileName(prefix);

 
 

-// Get first file name matching given wild card.
-
-#ifdef __UNIX__
+    return !buf.empty();
+}

 
 // 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 wxChar *spec, int flags)
 {

-    wxString result;
-
-#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
-    if (gs_dirStream)
-        closedir(gs_dirStream); // edz 941103: better housekeping
-
-    gs_findFlags = flags;
+    wxSplitPath(spec, &gs_dirPath, NULL, NULL);
+    if ( gs_dirPath.IsEmpty() )
+        gs_dirPath = wxT(".");
+    if ( !wxEndsWithPathSeparator(gs_dirPath ) )
+        gs_dirPath << wxFILE_SEP_PATH;

 
 

-    gs_strFileSpec = spec;
+    if (gs_dir)
+        delete gs_dir;
+    gs_dir = new wxDir(gs_dirPath);

 
 

-    // 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('/') )
-        path = wxT('/');
-    // path is empty => Local directory
-    if ( !path )
-        path = wxT('.');
-
-    gs_dirStream = opendir(path.fn_str());
-    if ( !gs_dirStream )
+    if ( !gs_dir->IsOpened() )

     {
     {

-        wxLogSysError(_("Can not enumerate files in directory '%s'"),
-                      path.c_str());
+        wxLogSysError(_("Can not enumerate files '%s'"), spec);
+        return wxEmptyString;

     }
     }

-    else
+
+    int dirFlags;
+    switch (flags)

     {
     {

-        result = wxFindNextFile();
+        case wxDIR:  dirFlags = wxDIR_DIRS; break;
+        case wxFILE: dirFlags = wxDIR_FILES; break;
+        default:     dirFlags = wxDIR_DIRS | wxDIR_FILES; break;

     }
     }

-#endif // !VMS6.x or earlier

 
 

-    return result;
-}
-
-wxString wxFindNextFile()
-{

     wxString result;
     wxString result;

-
-#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
-    wxCHECK_MSG( gs_dirStream, result, wxT("must call wxFindFirstFile first") );
-
-    // 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('/');
-
-    // Do the reading
-    struct dirent *nextDir;
-    for ( nextDir = readdir(gs_dirStream);
-          nextDir != NULL;
-          nextDir = readdir(gs_dirStream) )
+    gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);
+    if ( result.IsEmpty() )

     {
     {

-        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;
-}
-
-#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 wxFindFirstFile(const wxChar *spec, int flags)
-{
-    wxString result;
-
-    g_iter_flags = flags; /* MATTHEW: [5] Remember flags */
-
-    // Find path only so we can concatenate found file onto path
-    wxString path(wxPathOnly(spec));
-    if ( !path.IsEmpty() )
-        result << path << wxT('\\');
-
-    FSSpec fsspec ;
-
-    wxUnixFilename2FSSpec( result , &fsspec ) ;
-    g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
-    g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ;
-    g_iter.m_index = 0 ;
-
-    Boolean isDir ;
-    FSpGetDirectoryID( &fsspec , &g_iter.m_dirId , &isDir ) ;
-    if ( !isDir )
-        return wxEmptyString ;
-
-    return wxFindNextFile( ) ;
+    return gs_dirPath + result;

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

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

 
 

-    short err = noErr ;
-
-    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 ;
+    wxString result;
+    gs_dir->GetNext(&result);

 
 

-        // hit !
-        break ;
-    }
-    if ( err != noErr )
+    if ( result.IsEmpty() )

     {
     {

-        return wxEmptyString ;
+        wxDELETE(gs_dir);
+        return result;

     }
     }

-    FSSpec spec ;

 
 

-    FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum,
-                                   g_iter.m_dirId,
-                                   g_iter.m_name,
-                                   &spec) ;
-
-    return wxMacFSSpec2UnixFilename( &spec ) ;
+    return gs_dirPath + result;

 }
 
 }
 

-#elif defined(__WXMSW__)
-
-#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
-
-static wxString gs_strFileSpec;
-static int gs_findFlags = 0;

 
 

-wxString wxFindFirstFile(const wxChar *spec, int flags)
+// Get current working directory.
+// If buf is NULL, allocates space using new, else
+// copies into buf.
+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);
-
-    gs_hFileStruct = ::FindFirstFile(WXSTRINGCAST spec, &gs_findDataStruct);
-
-    if ( gs_hFileStruct == INVALID_HANDLE_VALUE )
+#ifdef __WXWINCE__
+    return NULL;
+#else
+    if ( !buf )

     {
     {

-        result.Empty();
-
-        return result;
+        buf = new wxChar[sz + 1];

     }
 
     }
 

-    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;
+    bool ok wxDUMMY_INITIALIZE(FALSE);
+
+    // for the compilers which have Unicode version of _getcwd(), call it
+    // directly, for the others call the ANSI version and do the translation
+#if !wxUSE_UNICODE
+    #define cbuf buf
+#else // wxUSE_UNICODE
+    bool needsANSI = TRUE;
+
+    #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
+        // This is not legal code as the compiler
+        // is allowed destroy the wxCharBuffer.
+        // wxCharBuffer c_buffer(sz);
+        // char *cbuf = (char*)(const char*)c_buffer;
+        char cbuf[_MAXPATHLEN];
+    #endif

 
 

-    return result;
-#else // !Win32
-    int flag = _A_NORMAL;
-    if (flags & wxDIR)
-        flag = _A_SUBDIR;
+    #ifdef HAVE_WGETCWD
+        #if wxUSE_UNICODE_MSLU
+            if ( wxGetOsVersion() != wxWIN95 )
+        #else
+            char *cbuf = NULL; // never really used because needsANSI will always be FALSE
+        #endif
+            {
+                ok = _wgetcwd(buf, sz) != NULL;
+                needsANSI = FALSE;
+            }
+    #endif

 
 

-#ifdef __BORLANDC__
-    if (findfirst(WXSTRINGCAST spec, &gs_findDataStruct, flag) == 0)
-#else
-        if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
-#endif
+    if ( needsANSI )
+#endif // wxUSE_UNICODE
+    {
+    #if defined(_MSC_VER) || defined(__MINGW32__)
+        ok = _getcwd(cbuf, sz) != NULL;
+    #elif defined(__WXMAC__) && !defined(__DARWIN__)
+        FSSpec cwdSpec ;
+        FCBPBRec pb;
+        OSErr error;
+        Str255  fileName ;
+        pb.ioNamePtr = (StringPtr) &fileName;
+        pb.ioVRefNum = 0;
+        pb.ioRefNum = LMGetCurApRefNum();
+        pb.ioFCBIndx = 0;
+        error = PBGetFCBInfoSync(&pb);
+        if ( error == noErr )

         {
         {

-            char attrib;
-
-#ifdef __BORLANDC__
-            attrib = gs_findDataStruct.ff_attrib;
-#else
-            attrib = gs_findDataStruct.attrib;
-#endif
-
-            if (attrib & _A_SUBDIR) {
-                if (!(gs_findFlags & wxDIR))
-                    return wxFindNextFile();
-            } else if (gs_findFlags && !(gs_findFlags & wxFILE))
-                return wxFindNextFile();
-
-            result +=
-#ifdef __BORLANDC__
-                    gs_findDataStruct.ff_name
-#else
-                    gs_findDataStruct.name
-#endif
-                    ;
+            cwdSpec.vRefNum = pb.ioFCBVRefNum;
+            cwdSpec.parID = pb.ioFCBParID;
+            cwdSpec.name[0] = 0 ;
+            wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
+                       wxStrcpy( buf , res ) ;                 
+            ok = TRUE;

         }
         }

-
-    return result;
-#endif // __WIN32__
-}
-
-
-wxString wxFindNextFile()
-{
-    wxString result;
-
-    // Find path only so we can concatenate found file onto path
-    wxString path(wxPathOnly(gs_strFileSpec));
-
-try_again:
-
-#ifdef __WIN32__
-    if (gs_hFileStruct == INVALID_HANDLE_VALUE)
-        return result;
-
-    bool success = (FindNextFile(gs_hFileStruct, &gs_findDataStruct) != 0);
-    if (!success)
-    {
-        FindClose(gs_hFileStruct);
-        gs_hFileStruct = INVALID_HANDLE_VALUE;
+        else
+        {
+            ok = FALSE;
+        }
+    #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] = '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 && !defined(__WXMAC__)
+        // finally convert the result to Unicode if needed
+        wxConvFile.MB2WC(buf, cbuf, sz);
+    #endif // wxUSE_UNICODE

     }
     }

-    else
-    {
-        bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);

 
 

-        if (isdir && !(gs_findFlags & wxDIR))
-            goto try_again;
-        else if (!isdir && gs_findFlags && !(gs_findFlags & wxFILE))
-            goto try_again;
+    if ( !ok )
+    {
+        wxLogSysError(_("Failed to get the working directory"));

 
 

-        if ( !path.IsEmpty() )
-            result << path << wxT('\\');
-        result << gs_findDataStruct.cFileName;
+        // 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');

     }
     }

-
-    return result;
-#else // Win16
-
-#ifdef __BORLANDC__
-    if (findnext(&gs_findDataStruct) == 0)
-#else
-        if (_dos_findnext(&gs_findDataStruct) == 0)
-#endif
+    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++)

         {
         {

-            /* 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
-                      ;
+            if (*ch == wxT('/'))
+                *ch = wxT('\\');

         }
         }

-
-    return result;
-#endif // Win32/16
-}
-
-#elif defined(__WXPM__)
-
-wxString wxFindFirstFile(const wxChar *spec, int flags)
-{
-    wxString result;
-
-    /*
-    // TODO: figure something out here for OS/2
-    gs_strFileSpec = spec;
-    gs_findFlags = flags;
-
-    // Find path only so we can concatenate found file onto path
-    wxString path(wxPathOnly(gs_strFileSpec));
-    if ( !path.IsEmpty() )
-        result << path << wxT('\\');
-
-    int flag = _A_NORMAL;
-    if (flags & wxDIR)
-        flag = _A_SUBDIR;
-
-    if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
-    {
-        char attrib;
-        attrib = gs_findDataStruct.attrib;
-
-        if (attrib & _A_SUBDIR) {
-            if (!(gs_findFlags & wxDIR))
-                return wxFindNextFile();
-        } else if (gs_findFlags && !(gs_findFlags & wxFILE))
-            return wxFindNextFile();
-
-        result += gs_findDataStruct.name;
+#endif // __DJGPP__
+
+// 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;
+        cygwin_conv_to_full_win32_path(pathUnix, buf);
+#endif // __CYGWIN__

     }
     }

-    */
-    return result;
-}
-
-wxString wxFindNextFile()
-{
-    wxString result;
-    // TODO:
-    return result;
-}

 
 

-#endif // Unix/Windows/OS/2
+    return buf;

 
 

-// 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__)
-    enum
-    {
-        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__)
-    enum
-    {
-        SFSaveDisk = 0x214, CurDirStore = 0x398
-    };
-    FSSpec cwdSpec ;
-
-    FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
-    wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
-    strcpy( buf , res ) ;
-    if (0) {
-#elif(__VISAGECPP__)
-    APIRET rc;
-    rc = ::DosQueryCurrentDir( 0 // current drive
-                              ,buf
-                              ,(PULONG)&sz
-                             );
-    if (rc != 0) {
-#else
-  if (getcwd(buf, sz) == NULL) {
-#endif
+#if !wxUSE_UNICODE
+    #undef cbuf

 #endif
 #endif

-    buf[0] = wxT('.');
-    buf[1] = wxT('\0');
-  }
-#if wxUSE_UNICODE
-  else {
-    wxConvFile.MB2WC(buf, cbuf, sz);
-    delete [] cbuf;
-  }
+

 #endif
 #endif

-  return buf;
+    // __WXWINCE__

 }
 
 wxString wxGetCwd()
 {
 }
 
 wxString wxGetCwd()
 {

-    static const size_t maxPathLen = 1024;
-
-    wxString str;
-    wxGetWorkingDirectory(str.GetWriteBuf(maxPathLen), maxPathLen);
-    str.UngetWriteBuf();
+    wxChar *buffer = new wxChar[_MAXPATHLEN];
+    wxGetWorkingDirectory(buffer, _MAXPATHLEN);
+    wxString str( buffer );
+    delete [] buffer;

 
     return str;
 }
 
 bool wxSetWorkingDirectory(const wxString& d)
 {
 
     return str;
 }
 
 bool wxSetWorkingDirectory(const wxString& d)
 {

-#if defined( __UNIX__ ) || defined( __WXMAC__ )
-  return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
-#elif defined(__WXPM__)
-  return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
+#if defined(__OS2__)
+    return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
+#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
+    return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);

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

-
+    

 #ifdef __WIN32__
 #ifdef __WIN32__

-  return (bool)(SetCurrentDirectory(d) != 0);
+#ifdef __WXWINCE__
+    // No equivalent in WinCE
+    return FALSE;

 #else
 #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)
+    return (bool)(SetCurrentDirectory(d) != 0);
+#endif
+#else
+    // Must change drive, too.
+    bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
+    if (isDriveSpec)

     {
     {

-       unsigned int noDrives;
-       _dos_setdrive(driveNo, &noDrives);
+        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)
+        {
+            unsigned int noDrives;
+            _dos_setdrive(driveNo, &noDrives);
+        }

     }
     }

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

 #endif
 #endif

-
+    

 #endif
 }
 
 #endif
 }
 


@@ -1764,10 +1695,14 @@ bool wxSetWorkingDirectory(const wxString& d)
 // On non-Windows platform, probably just return the empty string.
 wxString wxGetOSDirectory()
 {
 // On non-Windows platform, probably just return the empty string.
 wxString wxGetOSDirectory()
 {

-#ifdef __WINDOWS__
+#ifdef __WXWINCE__
+    return wxString(wxT("\\Windows"));
+#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)

     wxChar buf[256];
     GetWindowsDirectory(buf, 256);
     return wxString(buf);
     wxChar buf[256];
     GetWindowsDirectory(buf, 256);
     return wxString(buf);

+#elif defined(__WXMAC__)
+    return wxMacFindFolder(kOnSystemDisk, 'macs', false);

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


@@ -1775,14 +1710,12 @@ wxString wxGetOSDirectory()
 
 bool wxEndsWithPathSeparator(const wxChar *pszFileName)
 {
 
 bool wxEndsWithPathSeparator(const wxChar *pszFileName)
 {

-  size_t len = wxStrlen(pszFileName);
-  if ( len == 0 )
-    return FALSE;
-  else
-    return wxIsPathSeparator(pszFileName[len - 1]);
+    size_t len = wxStrlen(pszFileName);
+
+    return len && wxIsPathSeparator(pszFileName[len - 1]);

 }
 
 }
 

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

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


@@ -1809,7 +1742,7 @@ bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFi
             strFile += wxFILE_SEP_PATH;
         strFile += pszFile;
 
             strFile += wxFILE_SEP_PATH;
         strFile += pszFile;
 

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

             *pStr = strFile;
             break;
         }
             *pStr = strFile;
             break;
         }


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

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

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


@@ -1832,64 +1765,49 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
     // it can be empty, but it shouldn't be NULL
     wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );
 
     // it can be empty, but it shouldn't be NULL
     wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );
 

-    const wxChar *pDot = wxStrrchr(pszFileName, wxFILE_SEP_EXT);
+    wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt);
+}

 
 

-#ifdef __WXMSW__
-    // under Windows we understand both separators
-    const wxChar *pSepUnix = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
-    const wxChar *pSepDos = wxStrrchr(pszFileName, wxFILE_SEP_PATH_DOS);
-    const wxChar *pLastSeparator = pSepUnix > pSepDos ? pSepUnix : pSepDos;
-#else // assume Unix
-    const wxChar *pLastSeparator = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
-
-    if ( pDot )
+time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+{
+#ifdef __WXWINCE__
+    FILETIME creationTime, lastAccessTime, lastWriteTime;
+    HANDLE fileHandle = ::CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
+        0, FILE_ATTRIBUTE_NORMAL, 0);
+    if (fileHandle == INVALID_HANDLE_VALUE)
+        return 0;
+    else

     {
     {

-        if ( (pDot == pszFileName) || (*(pDot - 1) == wxFILE_SEP_PATH_UNIX) )
+        if (GetFileTime(fileHandle, & creationTime, & lastAccessTime, & lastWriteTime))

         {
         {

-            // under Unix, dot may be (and commonly is) the first character of the
-            // filename, don't treat the entire filename as extension in this case
-            pDot = NULL;
-        }
-    }
-#endif // MSW/Unix
+            CloseHandle(fileHandle);

 
 

-    if ( pDot && (pDot < pLastSeparator) )
-    {
-        // the dot is part of the path, not the start of the extension
-        pDot = NULL;
-    }
-
-    if ( pstrPath )
-    {
-        if ( pLastSeparator )
-            *pstrPath = wxString(pszFileName, pLastSeparator - pszFileName);
-        else
-            pstrPath->Empty();
-    }
-
-    if ( pstrName )
-    {
-        const wxChar *start = pLastSeparator ? pLastSeparator + 1 : pszFileName;
-        const wxChar *end = pDot ? pDot : pszFileName + wxStrlen(pszFileName);
-
-        *pstrName = wxString(start, end - start);
-    }
-
-    if ( pstrExt )
-    {
-        if ( pDot )
-            *pstrExt = wxString(pDot + 1);
+            wxDateTime dateTime;
+            FILETIME ftLocal;
+            if ( !::FileTimeToLocalFileTime(&lastWriteTime, &ftLocal) )
+            {
+                wxLogLastError(_T("FileTimeToLocalFileTime"));
+            }
+            
+            SYSTEMTIME st;
+            if ( !::FileTimeToSystemTime(&ftLocal, &st) )
+            {
+                wxLogLastError(_T("FileTimeToSystemTime"));
+            }
+            
+            dateTime.Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear,
+                st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
+            return dateTime.GetTicks();
+        }

         else
         else

-            pstrExt->Empty();
+            return 0;

     }
     }

-}
-
-time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
-{
+#else

     wxStructStat buf;
     wxStructStat buf;

+    wxStat( filename, &buf);

 
 

-    wxStat(filename.fn_str(), &buf);

     return buf.st_mtime;
     return buf.st_mtime;

+#endif

 }
 
 
 }
 
 


@@ -1899,10 +1817,12 @@ 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++) {
+    wxString tmp = pattern;
+    wxChar *pat = WXSTRINGCAST(tmp);
+    while (*pat)
+    {
+        switch (*pat++)
+        {

         case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
             return TRUE;
         case wxT('\\'):
         case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
             return TRUE;
         case wxT('\\'):


@@ -1911,160 +1831,135 @@ bool wxIsWild( const wxString& pattern )
         }
     }
     return FALSE;
         }
     }
     return FALSE;

-};
-
-bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
-
-#if defined(HAVE_FNMATCH_H)
-{
-// 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

 
 

-// #pragma error Broken implementation of wxMatchWild() -- needs fixing!
+/*
+* Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
+*
+* The match procedure is public domain code (from ircII's reg.c)
+*/

 
 

-   /*
-    * WARNING: this code is broken!
-    */
+bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )

 {
 {

-  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;
+        if (text.empty())
+        {
+                /* Match if both are empty. */
+                return pat.empty();
+        }

 
 

-    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))))
-                /*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;
+        const wxChar *m = pat.c_str(),
+        *n = text.c_str(),
+        *ma = NULL,
+        *na = NULL,
+        *mp = NULL,
+        *np = NULL;
+        int just = 0,
+        pcount = 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;
+                        mp = NULL;
+                        acount = count;

                 }
                 }

-            } else if (*pattern != *str) {
-                pattern++;
-                goto repeat;
-            }
-            pattern++;
-            while ((*pattern != wxT(']')) && (*pattern != wxT('\0'))) {
-                if ((*pattern == wxT('\\')) && (*(pattern + 1) != wxT('\0')))
-                    pattern++;
-                pattern++;
-            }
-            if (*pattern != wxT('\0')) {
-                pattern++, str++;
-            }
-            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++);
+                else if (*m == wxT('?'))
+                {
+                        m++;
+                        if (!*n++)
+                        return FALSE;

                 }
                 }

-                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
+                {
+                        if (*m == wxT('\\'))
+                        {
+                                m++;
+                                /* Quoting "nothing" is a bad thing */
+                                if (!*m)
+                                return FALSE;

                         }
                         }

-                    }
-                } else {
-                    while (*pattern!=CB && *pattern!=wxT(',') && *pattern!=wxT('\0')) {
-                        if (*++pattern == wxT('\\')) {
-                            if (*++pattern == CB || *pattern == wxT(','))
-                                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;
+                        }
+                        /*
+                        * 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++;
+                                if (*n == wxT(' '))
+                                mp = NULL;
+                                count++;
+                                n++;
+                        }
+                        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 (mp)
+                                {
+                                        m = mp;
+                                        if (*np == wxT(' '))
+                                        {
+                                                mp = NULL;
+                                                goto check_percent;
+                                        }
+                                        n = ++np;
+                                        count = pcount;
+                                }
+                                else
+                                check_percent:
+
+                                if (ma)
+                                {
+                                        m = ma;
+                                        n = ++na;
+                                        count = acount;
+                                }
+                                else
+                                return FALSE;

                         }
                         }

-                    }

                 }
                 }

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

         }
         }

-    }
-    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