fixed MSVC6 warning

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 8207942f5e321bfa296b80cfd629c13846b8ccd3..eaefdbca40a5010212ac2c4bb041515c48191610 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -6,11 +6,19 @@
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "filefn.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "filefn.h"

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


@@ -18,15 +26,14 @@
 #include "wx/defs.h"
 
 #ifdef __BORLANDC__
 #include "wx/defs.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
+    #pragma hdrstop

 #endif
 
 #include "wx/utils.h"
 #endif
 
 #include "wx/utils.h"

-#include <wx/intl.h>
+#include "wx/intl.h"
+#include "wx/file.h" // This does include filefn.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__


@@ -43,104 +50,161 @@
     #endif
 #endif
 
     #endif
 #endif
 

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

 #endif
 
 #endif
 

-#ifdef __UNIX__
-#include <unistd.h>
-#include <dirent.h>
+#include "wx/log.h"
+
+// No, Cygwin doesn't appear to have fnmatch.h after all.
+#if defined(HAVE_FNMATCH_H)
+    #include "fnmatch.h"

 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__

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

 #endif
 
 #endif
 

-#ifdef __GNUWIN32__
-#ifndef __TWIN32__
-#include <sys/unistd.h>
-#endif
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------

 
 

-#define stricmp strcasecmp
+#ifndef _MAXPATHLEN
+    #define _MAXPATHLEN 1024

 #endif
 
 #endif
 

-#ifdef __BORLANDC__ // Please someone tell me which version of Borland needs
-                    // this (3.1 I believe) and how to test for it.
-                    // If this works for Borland 4.0 as well, then no worries.
-#include <dir.h>
+#ifdef __WXMAC__
+#    include "MoreFilesX.h"

 #endif
 
 #endif
 

-#ifdef __SALFORDC__
-#include <dir.h>
-#include <unix.h>
-#endif
+// ----------------------------------------------------------------------------
+// private globals
+// ----------------------------------------------------------------------------

 
 

-#include "wx/setup.h"
-#include "wx/log.h"
+// MT-FIXME: get rid of this horror and all code using it
+static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];

 
 

-// No, Cygwin doesn't appear to have fnmatch.h after all.
-#if defined(HAVE_FNMATCH_H)
-#include   "fnmatch.h"
+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+//
+// VisualAge C++ V4.0 cannot have any external linkage const decs
+// in headers included by more than one primary source
+//
+const off_t wxInvalidOffset = (off_t)-1;

 #endif
 
 #endif
 

-#ifdef __WINDOWS__
-#include "windows.h"
-#endif
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------

 
 

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

 
 

-extern char *wxBuffer;
-#ifdef __WXMAC__
-extern char gwxMacFileName[] ;
-extern char gwxMacFileName2[] ;
-extern char gwxMacFileName3[] ;
-#endif
+// ============================================================================
+// 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 );
+}

 
 

-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)

 #endif
 #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)
 {
 
 void wxPathList::Add (const wxString& path)
 {

-  wxStringList::Add ((char *)(const char *)path);
+    wxStringList::Add (WXSTRINGCAST 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 char PATH_TOKS[] =
-#ifdef __WINDOWS__
-        " ;"; // 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
 #else

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

 #endif
 
 #endif
 

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

     {
     {

-      char *s = copystring (val);
-      char *token = strtok (s, PATH_TOKS);
+        wxChar *s = MYcopystring (val);
+        wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);

 
 

-      if (token)
+        if (token)

         {
         {

-          Add (copystring (token));
-          while (token)
+            Add(token);
+            while (token)

             {
             {

-              if ((token = strtok ((char *) NULL, PATH_TOKS)) != NULL)
-                Add (wxString(token));
+                if ( (token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr))
+                    != NULL )
+                {
+                    Add(token);
+                }

             }
         }
             }
         }

-      delete[]s;
+
+        // suppress warning about unused variable save_ptr when wxStrtok() is a
+        // macro which throws away its third argument
+        save_ptr = token;
+
+        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


@@ -148,22 +212,21 @@ void wxPathList::AddEnvList (const wxString& envVariable)
 // to the list if not already there.
 void wxPathList::EnsureFileAccessible (const wxString& path)
 {
 // to the list if not already there.
 void wxPathList::EnsureFileAccessible (const wxString& path)
 {

-  wxString path1(path);
-  char *path_only = wxPathOnly (WXSTRINGCAST path1);
-  if (path_only)
-  {
-      if (!Member (wxString(path_only)))
-            Add (wxString(path_only));
-  }
+    wxString path_only(wxPathOnly(path));
+    if ( !path_only.IsEmpty() )
+    {
+        if ( !Member(path_only) )
+            Add(path_only);
+    }

 }
 
 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((char *) 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


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

-        return TRUE;
+        return true;

   }
   }

-  return FALSE;
+  return false;

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

-  if (wxFileExists (wxExpandPath(wxBuffer, file)))
-    return wxString(wxBuffer);
+  if (wxFileExists (wxExpandPath(wxFileFunctionsBuffer, file)))
+    return wxString(wxFileFunctionsBuffer);

 
 

-  char buf[_MAXPATHLEN];
-  strcpy(buf, wxBuffer);
+  wxChar buf[_MAXPATHLEN];
+  wxStrcpy(buf, wxFileFunctionsBuffer);

 
 

-  char *filename = (char*) NULL; /* shut up buggy egcs warning */
-  filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (char *)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())

     {
     {

-      char *path = (char *) node->Data ();
-      strcpy (wxBuffer, path);
-      char ch = wxBuffer[strlen(wxBuffer)-1];
-      if (ch != '\\' && ch != '/')
-        strcat (wxBuffer, "/");
-      strcat (wxBuffer, filename);
+      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__
 #ifdef __WINDOWS__

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

 #endif
 #endif

-      if (wxFileExists (wxBuffer))
+      if (wxFileExists (wxFileFunctionsBuffer))

       {
       {

-        return wxString(wxBuffer);        // Found!
+        return wxString(wxFileFunctionsBuffer);        // Found!

       }
     }                                // for()
 
       }
     }                                // for()
 

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

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

-  wxString f = FindValidPath(file);
-  if (wxIsAbsolutePath(f))
-    return f;
-  else
-  {
-    char buf[500];
-    wxGetWorkingDirectory(buf, 499);
-    int len = (int)strlen(buf);
-    char lastCh = 0;
-    if (len > 0)
-      lastCh = buf[len-1];
-    if (lastCh != '/' && lastCh != '\\')
+    wxString f = FindValidPath(file);
+    if ( f.empty() || wxIsAbsolutePath(f) )
+        return f;
+
+    wxString buf;
+    wxGetWorkingDirectory(wxStringBuffer(buf, _MAXPATHLEN), _MAXPATHLEN);
+
+    if ( !wxEndsWithPathSeparator(buf) )

     {
     {

-#ifdef __WINDOWS__
-      strcat(buf, "\\");
-#else
-      strcat(buf, "/");
-#endif
+        buf += wxFILE_SEP_PATH;

     }
     }

-    strcat(buf, (const char *)f);
-    strcpy(wxBuffer, buf);
-    return wxString(wxBuffer);
-  }
+    buf += f;
+
+    return buf;

 }
 
 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;
-        strcpy( gwxMacFileName , filename ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-          if (gwxMacFileName && stat ((char *)(const char *)gwxMacFileName, &stbuf) == 0)
-            return TRUE;
-    return FALSE ;
-#else
-
-#ifdef __SALFORDC__
-  struct _stat stbuf;
-#else
-  struct stat stbuf;
-#endif
-
-  if ((filename != "") && stat ((char *)(const char *)filename, &stbuf) == 0)
-    return TRUE;
-  return FALSE;
-#endif
-}
-
-/* Vadim's alternative implementation
-
-// does the file exist?
-bool wxFileExists(const char *pszFileName)
-{
-  struct stat st;
-  return !access(pszFileName, 0) &&
-         !stat(pszFileName, &st) &&
-         (st.st_mode & S_IFREG);
+    // 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);
+
+    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 != "")
+    if (filename != wxT(""))

     {
     {

-      if (filename[0] == '/'
+#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] == '[' && filename[1] != '.')
+        if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
+            return true;

 #endif
 #endif

-#ifdef __WINDOWS__
-      /* MSDOS */
-      || filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
+#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 ;

 }
 
 /*
 }
 
 /*


@@ -300,13 +340,13 @@ wxIsAbsolutePath (const wxString& filename)
  *
  */
 
  *
  */
 

-void wxStripExtension(char *buffer)
+void wxStripExtension(wxChar *buffer)

 {
 {

-  int len = strlen(buffer);
+  int len = wxStrlen(buffer);

   int i = len-1;
   while (i > 0)
   {
   int i = len-1;
   while (i > 0)
   {

-    if (buffer[i] == '.')
+    if (buffer[i] == wxT('.'))

     {
       buffer[i] = 0;
       break;
     {
       buffer[i] = 0;
       break;


@@ -321,7 +361,7 @@ void wxStripExtension(wxString& buffer)
   size_t i = len-1;
   while (i > 0)
   {
   size_t i = len-1;
   while (i > 0)
   {

-    if (buffer.GetChar(i) == '.')
+    if (buffer.GetChar(i) == wxT('.'))

     {
       buffer = buffer.Left(i);
       break;
     {
       buffer = buffer.Left(i);
       break;


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

-char *wxRealPath (char *path)
+wxChar *wxRealPath (wxChar *path)

 {
 #ifdef __WXMSW__
 {
 #ifdef __WXMSW__

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

 #else
 #else

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

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

-    char *p;
-    if (path[2] == SEP && path[1] == '.')
+    wxChar *p;
+    if (path[2] == SEP && path[1] == wxT('.'))

       p = &path[0];
     else
       p = &path[2];
       p = &path[0];
     else
       p = &path[2];


@@ -350,32 +390,36 @@ char *wxRealPath (char *path)
       {
         if (*p == SEP)
           {
       {
         if (*p == SEP)
           {

-            if (p[1] == '.' && p[2] == '.' && (p[3] == SEP || p[3] == '\0'))
+            if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))

               {
               {

-                char *q;
-                for (q = p - 1; q >= path && *q != SEP; q--);
-                if (q[0] == SEP && (q[1] != '.' || q[2] != '.' || q[3] != SEP)
+                wxChar *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))
                   {
                     && (q - 1 <= path || q[-1] != SEP))
                   {

-                    strcpy (q, p + 3);
-                    if (path[0] == '\0')
+                    wxStrcpy (q, p + 3);
+                    if (path[0] == wxT('\0'))

                       {
                         path[0] = SEP;
                       {
                         path[0] = SEP;

-                        path[1] = '\0';
+                        path[1] = wxT('\0');

                       }
                       }

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

                     /* Check that path[2] is NULL! */
                     /* Check that path[2] is NULL! */

-                    else if (path[1] == ':' && !path[2])
+                    else if (path[1] == wxT(':') && !path[2])

                       {
                         path[2] = SEP;
                       {
                         path[2] = SEP;

-                        path[3] = '\0';
+                        path[3] = wxT('\0');

                       }
 #endif
                     p = q - 1;
                   }
               }
                       }
 #endif
                     p = q - 1;
                   }
               }

-            else if (p[1] == '.' && (p[2] == SEP || p[2] == '\0'))
-              strcpy (p, p + 2);
+            else if (p[1] == wxT('.') && (p[2] == SEP || p[2] == wxT('\0')))
+              wxStrcpy (p, p + 2);

           }
       }
   }
           }
       }
   }


@@ -383,27 +427,27 @@ char *wxRealPath (char *path)
 }
 
 // Must be destroyed
 }
 
 // Must be destroyed

-char *wxCopyAbsolutePath(const wxString& filename)
+wxChar *wxCopyAbsolutePath(const wxString& filename)

 {
 {

-  if (filename == "")
-    return (char *) NULL;
-
-  if (! IsAbsolutePath(wxExpandPath(wxBuffer, filename))) {
-    char    buf[_MAXPATHLEN];
-    buf[0] = '\0';
-    wxGetWorkingDirectory(buf, sizeof(buf)/sizeof(char));
-    char ch = buf[strlen(buf) - 1];
+  if (filename == wxT(""))
+    return (wxChar *) NULL;
+
+  if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
+    wxChar  buf[_MAXPATHLEN];
+    buf[0] = wxT('\0');
+    wxGetWorkingDirectory(buf, WXSIZEOF(buf));
+    wxChar ch = buf[wxStrlen(buf) - 1];

 #ifdef __WXMSW__
 #ifdef __WXMSW__

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

 #else
 #else

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

 #endif
 #endif

-    strcat(buf, wxBuffer);
-    return copystring( wxRealPath(buf) );
+    wxStrcat(buf, wxFileFunctionsBuffer);
+    return MYcopystring( wxRealPath(buf) );

   }
   }

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

 }
 
 /*-
 }
 
 /*-


@@ -429,109 +473,139 @@ char *wxCopyAbsolutePath(const wxString& filename)
 
 /* input name in name, pathname output to buf. */
 
 
 /* input name in name, pathname output to buf. */
 

-char *wxExpandPath(char *buf, const char *name)
+wxChar *wxExpandPath(wxChar *buf, const wxChar *name)

 {
 {

-    register char  *d, *s, *nm;
-    char            lnm[_MAXPATHLEN];
-    int                                q;
+    register wxChar *d, *s, *nm;
+    wxChar          lnm[_MAXPATHLEN];
+    int             q;

 
     // Some compilers don't like this line.
 
     // Some compilers don't like this line.

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

 
 

-    char      trimchars[4];
-    trimchars[0] = '\n';
-    trimchars[1] = ' ';
-    trimchars[2] = '\t';
+    wxChar      trimchars[4];
+    trimchars[0] = wxT('\n');
+    trimchars[1] = wxT(' ');
+    trimchars[2] = wxT('\t');

     trimchars[3] = 0;
 
 #ifdef __WXMSW__
     trimchars[3] = 0;
 
 #ifdef __WXMSW__

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

 #else
 #else

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

 #endif
 #endif

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

         return buf;
         return buf;

-    nm = copystring(name); // Make a scratch copy
-    char *nm_tmp = nm;
+    nm = MYcopystring(name); // Make a scratch copy
+    wxChar *nm_tmp = nm;

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

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

         nm++;
     /* And strip off trailing whitespace and cr */
         nm++;
     /* And strip off trailing whitespace and cr */

-    s = nm + (q = strlen(nm)) - 1;
-    while (q-- && strchr((char *)trimchars, *s) != NULL)
-        *s = '\0';
+    s = nm + (q = wxStrlen(nm)) - 1;
+    while (q-- && wxStrchr((wxChar *)trimchars, *s) != NULL)
+        *s = wxT('\0');

 
     s = nm;
     d = lnm;
 #ifdef __WXMSW__
     q = FALSE;
 #else
 
     s = nm;
     d = lnm;
 #ifdef __WXMSW__
     q = FALSE;
 #else

-    q = nm[0] == '\\' && nm[1] == '~';
+    q = nm[0] == wxT('\\') && nm[1] == wxT('~');

 #endif
 
     /* Expand inline environment variables */
 #endif
 
     /* Expand inline environment variables */

-    while ((*d++ = *s)) {
-#ifndef __WXMSW__
-        if (*s == '\\') {
+#ifdef __VISAGECPP__
+    while (*d)
+    {
+      *d++ = *s;
+      if(*s == wxT('\\'))
+      {
+        *(d - 1) = *++s;
+        if (*d)
+        {
+          s++;
+          continue;
+        }
+        else
+           break;
+      }
+      else
+#else
+    while ((*d++ = *s) != 0) {
+#  ifndef __WXMSW__
+        if (*s == wxT('\\')) {

             if ((*(d - 1) = *++s)) {
                 s++;
                 continue;
             } else
                 break;
         } else
             if ((*(d - 1) = *++s)) {
                 s++;
                 continue;
             } else
                 break;
         } else

+#  endif

 #endif
 #endif

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

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-        if (*s++ == '$' && (*s == '{' || *s == ')'))
+        if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))

 #else
 #else

-        if (*s++ == '$')
+        if (*s++ == wxT('$'))

 #endif
         {
 #endif
         {

-            register char  *start = d;
-            register int   braces = (*s == '{' || *s == '(');
-            register char  *value;
-            while ((*d++ = *s))
-                if (braces ? (*s == '}' || *s == ')') : !(isalnum(*s) || *s == '_') )
+            register wxChar  *start = d;
+            register int     braces = (*s == wxT('{') || *s == wxT('('));
+            register wxChar  *value;
+            while ((*d++ = *s) != 0)
+                if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )

                     break;
                 else
                     s++;
             *--d = 0;
                     break;
                 else
                     s++;
             *--d = 0;

-            value = getenv(braces ? start + 1 : start);
+            value = wxGetenv(braces ? start + 1 : start);

             if (value) {
             if (value) {

-                for ((d = start - 1); (*d++ = *value++););
+                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 = "";
-    if (nm[0] == '~' && !q)
+    if (nm[0] == wxT('~') && !q)

     {
         /* prefix ~ */
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */
     {
         /* prefix ~ */
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */

-            if ((s = wxGetUserHome("")) != NULL) {
+        // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+            if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) {

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

-            register char  *nnm;
-            register char  *home;
-            for (s = nm; *s && *s != SEP; s++);
+            register wxChar  *nnm;
+            register wxChar  *home;
+            for (s = nm; *s && *s != SEP; s++)
+            {
+                // Empty
+            }

             int was_sep; /* MATTHEW: Was there a separator, or NULL? */
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;
             *s = 0;
             int was_sep; /* MATTHEW: Was there a separator, or NULL? */
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;
             *s = 0;

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

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

-                s = "";
+                s = NULL;

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


@@ -542,21 +616,22 @@ char *wxExpandPath(char *buf, const char *name)
     d = buf;
     if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */
         /* Copy home dir */
     d = buf;
     if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */
         /* Copy home dir */

-        while ('\0' != (*d++ = *s++))
+        while (wxT('\0') != (*d++ = *s++))

           /* loop */;
         // Handle root home
         if (d - 1 > buf && *(d - 2) != SEP)
           *(d - 1) = SEP;
     }
     s = nm;
           /* loop */;
         // Handle root home
         if (d - 1 > buf && *(d - 2) != SEP)
           *(d - 1) = SEP;
     }
     s = nm;

-    while ((*d++ = *s++));
-
+    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);
 }
 

-

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


@@ -564,293 +639,298 @@ char *wxExpandPath(char *buf, const char *name)
 
    The call wxExpandPath can convert these back!
  */
 
    The call wxExpandPath can convert these back!
  */

-char *
+wxChar *

 wxContractPath (const wxString& filename, const wxString& envname, const wxString& user)
 {
 wxContractPath (const wxString& filename, const wxString& envname, const wxString& user)
 {

-  static char dest[_MAXPATHLEN];
+  static wxChar dest[_MAXPATHLEN];

 
 

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

 
 

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

 #ifdef __WXMSW__
 #ifdef __WXMSW__

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

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

-  char *val = (char *) NULL;
-  char *tcp = (char *) NULL;
-  if (envname != WXSTRINGCAST NULL && (val = getenv (WXSTRINGCAST envname)) != NULL &&
-     (tcp = strstr (dest, val)) != NULL)
+  const wxChar *val;
+#ifndef __WXWINCE__
+  wxChar *tcp;
+  if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
+     (tcp = wxStrstr (dest, val)) != NULL)

     {
     {

-        strcpy (wxBuffer, tcp + strlen (val));
-        *tcp++ = '$';
-        *tcp++ = '{';
-        strcpy (tcp, WXSTRINGCAST envname);
-        strcat (tcp, "}");
-        strcat (tcp, wxBuffer);
+        wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));
+        *tcp++ = wxT('$');
+        *tcp++ = wxT('{');
+        wxStrcpy (tcp, WXSTRINGCAST envname);
+        wxStrcat (tcp, wxT("}"));
+        wxStrcat (tcp, wxFileFunctionsBuffer);

     }
     }

+#endif

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

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

 
   return dest;
 }
 
 
   return dest;
 }
 

-// Return just the filename, not the path
-// (basename)
-char *wxFileNameFromPath (char *path)
+// Return just the filename, not the path (basename)
+wxChar *wxFileNameFromPath (wxChar *path)

 {
 {

-  if (path)
-    {
-      register char *tcp;
+    wxString p = path;
+    wxString n = wxFileNameFromPath(p);

 
 

-      tcp = path + strlen (path);
-      while (--tcp >= path)
-        {
-          if (*tcp == '/' || *tcp == '\\'
-#ifdef __VMS__
-     || *tcp == ':' || *tcp == ']')
-#else
-     )
-#endif
-            return tcp + 1;
-        }                        /* while */
-#ifdef __WXMSW__
-      if (isalpha (*path) && *(path + 1) == ':')
-        return path + 2;
-#endif
-    }
-  return path;
+    return path + p.length() - n.length();

 }
 
 }
 

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

 {
 {

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

 
 

-      char *path = WXSTRINGCAST path1 ;
-      register char *tcp;
-
-      tcp = path + strlen (path);
-      while (--tcp >= path)
-          {
-            if (*tcp == '/' || *tcp == '\\'
-#ifdef __VMS__
-        || *tcp == ':' || *tcp == ']')
-#else
-        )
-#endif
-                return wxString(tcp + 1);
-            }                        /* while */
-#ifdef __WXMSW__
-      if (isalpha (*path) && *(path + 1) == ':')
-            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
 }
 
 // Return just the directory, or NULL if no directory

-char *
-wxPathOnly (char *path)
+wxChar *
+wxPathOnly (wxChar *path)

 {
 {

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

     {
     {

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

 
 

-      int l = strlen(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] == '/' || path[i] == '\\' || path[i] == ']')
+        // 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 --;
-      }

 
 

-#ifdef __WXMSW__
-      // Try Drive specifier
-      if (isalpha (buf[0]) && buf[1] == ':')
+#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] = '.';
-          buf[3] = '\0';
-          return buf;
+            // A:junk --> A:. (since A:.\junk Not A:\junk)
+            buf[2] = wxT('.');
+            buf[3] = wxT('\0');
+            return buf;

         }
 #endif
     }
         }
 #endif
     }

-
-  return (char *) 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 != "")
+    if (path != wxT(""))

     {
     {

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

 
 

-      // Local copy
-      strcpy (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] == '/' || path[i] == '\\' || path[i] == ']')
+        // 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('\\'))
+            {
+                // Don't return an empty string
+                if (i == 0)
+                    i ++;
+                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 --;
-      }

 
 

-#ifdef __WXMSW__
-      // Try Drive specifier
-      if (isalpha (buf[0]) && buf[1] == ':')
+#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] = '.';
-          buf[3] = '\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("");
+    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__
-void
-wxMac2UnixFilename (char *s)
+#if defined(__WXMAC__)
+
+#if TARGET_API_MAC_OSX
+#define kDefaultPathStyle kCFURLPOSIXPathStyle
+#else
+#define kDefaultPathStyle kCFURLHFSPathStyle
+#endif
+
+wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )

 {
 {

-        if (s)
-        {
-                memmove( s+1 , s ,strlen( s ) + 1) ;
-                if ( *s == ':' )
-                        *s = '.' ;
-                else
-                        *s = '/' ;
+    CFURLRef fullURLRef;
+    fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
+    if ( additionalPathComponent )
+    {
+        CFURLRef parentURLRef = fullURLRef ;
+        fullURLRef = CFURLCreateCopyAppendingPathComponent(NULL, parentURLRef,
+            additionalPathComponent,false);
+        CFRelease( parentURLRef ) ;
+    }
+    CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle);
+    CFRelease( fullURLRef ) ;
+    return wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding());
+}

 
 

-                while (*s)
-                {
-                        if (*s == ':')
-                          *s = '/';
-                        else
-                          *s = wxToLower (*s);        // Case INDEPENDENT
-                        s++;
-                }
-        }
+OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
+{
+    OSStatus err = noErr ;
+    CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, wxMacCFStringHolder(path ,wxLocale::GetSystemEncoding() ) , kDefaultPathStyle, false);
+    if ( NULL != url )
+    {
+        if ( CFURLGetFSRef(url, fsRef) == false )
+            err = fnfErr ;
+        CFRelease( url ) ;
+    }
+    else
+    {
+        err = fnfErr ;
+    }
+    return err ;

 }
 
 }
 

-void
-wxUnix2MacFilename (char *s)
+wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )

 {
 {

-        if (s)
-        {
-                if ( *s == '.' )
-                {
-                        // relative path , since it goes on with slash which is translated to a :
-                        memmove( s , s+1 ,strlen( s ) ) ;
-                }
-                else if ( *s == '/' )
-                {
-                        // absolute path -> on mac just start with the drive name
-                        memmove( s , s+1 ,strlen( s ) ) ;
-                }
-                else
-                {
-                        wxASSERT_MSG( 1 , "unkown path beginning" ) ;
-                }
-                while (*s)
-                {
-                        if (*s == '/' || *s == '\\')
-                                  *s = ':';
+    CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
+                                                      uniname->unicode,
+                                                      uniname->length );
+    return wxMacCFStringHolder(cfname).AsString() ;
+}

 
 

-                        s++ ;
-                }
-        }
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
+{
+    FSRef fsRef ;
+    if ( FSpMakeFSRef( spec , &fsRef) == noErr )
+    {
+        return wxMacFSRefToPath( &fsRef ) ;
+    }
+    return wxEmptyString ;

 }
 }

-#endif
+
+void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
+{
+    OSStatus err = noErr ;
+    FSRef fsRef ;
+    wxMacPathToFSRef( path , &fsRef ) ;
+    err = FSRefMakeFSSpec( &fsRef , spec ) ;
+}
+
+#endif // __WXMAC__
+

 void
 void

-wxDos2UnixFilename (char *s)
+wxDos2UnixFilename (wxChar *s)

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

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

 #ifdef __WXMSW__
         else
 #ifdef __WXMSW__
         else

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

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

-#ifdef __WXMSW__
-wxUnix2DosFilename (char *s)
+#if defined(__WXMSW__) || defined(__OS2__)
+wxUnix2DosFilename (wxChar *s)

 #else
 #else

-wxUnix2DosFilename (char *WXUNUSED(s))
+wxUnix2DosFilename (wxChar *WXUNUSED(s) )

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

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

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

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

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


@@ -860,28 +940,17 @@ wxUnix2DosFilename (char *WXUNUSED(s))
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {

-  char *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__
-        strcpy( gwxMacFileName , file1 ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-        strcpy( gwxMacFileName2 , file2) ;
-        wxUnix2MacFilename( gwxMacFileName2 ) ;
-        strcpy( gwxMacFileName3 , outfile) ;
-        wxUnix2MacFilename( gwxMacFileName3 ) ;
-
-  if ((fp1 = fopen (gwxMacFileName, "rb")) == NULL ||
-      (fp2 = fopen (gwxMacFileName2, "rb")) == NULL ||
-      (fp3 = fopen (gwxMacFileName3, "wb")) == NULL)
-#else
-  if ((fp1 = fopen (WXSTRINGCAST file1, "rb")) == NULL ||
-      (fp2 = fopen (WXSTRINGCAST file2, "rb")) == NULL ||
-      (fp3 = fopen (outfile, "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);


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

-      return FALSE;
+      return false;

     }
 
   int ch;
     }
 
   int ch;


@@ -903,638 +972,740 @@ 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__
-        strcpy( gwxMacFileName , file1 ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-        strcpy( gwxMacFileName2 , file2) ;
-        wxUnix2MacFilename( gwxMacFileName2 ) ;
-
-  if ((fd1 = fopen (gwxMacFileName, "rb")) == NULL)
-    return FALSE;
-  if ((fd2 = fopen (gwxMacFileName2, "wb")) == NULL)
-#else
-  if ((fd1 = fopen (WXSTRINGCAST file1, "rb")) == NULL)
-    return FALSE;
-  if ((fd2 = fopen (WXSTRINGCAST file2, "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 )
+    {
+        // 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)))

     {
     {

-      fclose (fd1);
-      return FALSE;
+        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__
-        strcpy( gwxMacFileName , file1 ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-        strcpy( gwxMacFileName2 , file2) ;
-        wxUnix2MacFilename( gwxMacFileName2 ) ;
-
-  if (0 == rename (gwxMacFileName, gwxMacFileName2))
-    return TRUE;
-#else
-  // Normal system call
-  if (0 == rename (WXSTRINGCAST file1, WXSTRINGCAST file2))
-    return TRUE;
+#ifndef __WXWINCE__
+    // Normal system call
+  if ( wxRename (file1, file2) == 0 )
+    return true;

 #endif
 #endif

+

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

-    return TRUE;
+    return true;

   }
   // Give up
   }
   // Give up

-  return FALSE;
+  return false;

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

-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
-  int flag = remove(WXSTRINGCAST file);
-#elif defined( __WXMAC__ )
-        strcpy( gwxMacFileName , file ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-  int flag = unlink(gwxMacFileName);
+#if defined(__VISUALC__) \
+ || defined(__BORLANDC__) \
+ || defined(__WATCOMC__) \
+ || defined(__DMC__) \
+ || defined(__GNUWIN32__) \
+ || (defined(__MWERKS__) && defined(__MSL__))
+  int res = wxRemove(file);
+#elif defined(__WXMAC__)
+  int res = unlink(wxFNCONV(file));

 #else
 #else

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

 #endif
 #endif

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

 }
 
 }
 

-bool wxMkdir(const wxString& dir)
+bool wxMkdir(const wxString& dir, int perm)

 {
 {

-#if defined(__WXSTUBS__)
-  return FALSE;
-#elif defined(__VMS__)
-        return FALSE;
-#elif defined( __WXMAC__ )
-  strcpy( gwxMacFileName , dir ) ;
-  wxUnix2MacFilename( gwxMacFileName ) ;
-  return (mkdir(gwxMacFileName , 0 ) == 0);
-#elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)
-  return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 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
+#if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
+  #if defined(MSVCRT)
+    wxUnusedVar(perm);
+    if ( mkdir(wxFNCONV(dirname)) != 0 )
+  #else
+    if ( mkdir(wxFNCONV(dirname), perm) != 0 )
+  #endif
+#elif defined(__OS2__)
+    if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
+#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
 #else

-  return (mkdir(WXSTRINGCAST dir) == 0);
+    if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )

 #endif
 #endif

+#endif // !MSW/MSW
+    {
+        wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
+
+        return false;
+    }
+
+    return true;
+#endif // Mac/!Mac

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

-  return FALSE;
-#elif defined( __WXMAC__ )
-        strcpy( gwxMacFileName , dir ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-  return (rmdir(WXSTRINGCAST gwxMacFileName) == 0);
+    return false; //to be changed since rmdir exists in VMS7.x
+#elif defined(__OS2__)
+    return (::DosDeleteDir((PSZ)dir.c_str()) == 0);

 #else
 
 #else
 

-#ifdef __SALFORDC__
-  return FALSE; // What to do?
+#ifdef __WXWINCE__
+    return (CreateDirectory(dir, NULL) != 0);

 #else
 #else

-  return (rmdir(WXSTRINGCAST dir) == 0);
+    return (wxRmDir(OS_FILENAME(dir)) == 0);

 #endif
 
 #endif
 }
 
 #endif
 
 #endif
 }
 

-#if 0
-bool wxDirExists(const wxString& dir)
+// does the path exists? (may have or not '/' or '\\' at the end)
+bool wxPathExists(const wxChar *pszPathName)

 {
 {

-#ifdef __VMS__
-  return FALSE;
-#elif !defined(__WXMSW__)
-  struct stat sbuf;
-  return (stat(dir, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE;
-#else
+    wxString strPath(pszPathName);

 
 

-  /* 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(__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();
+        if ( len == 1 || (len == 3 && strPath[len - 2] == _T(':')) )
+            break;

 
 

-#if defined(__WIN32__)
-        HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo);
+        strPath.Truncate(len - 1);
+    }
+#endif // __WINDOWS__

 
 

-        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
+#ifdef __OS2__
+    // OS/2 can't handle "d:", it wants either "d:\" or "d:."
+    if (strPath.length() == 2 && strPath[1u] == _T(':'))
+        strPath << _T('.');

 #endif
 
 #endif
 

-#endif
-}
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    // stat() can't cope with network paths
+    DWORD ret = ::GetFileAttributes(strPath);

 
 

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

 
 

-// does the path exists? (may have or not '/' or '\\' at the end)
-bool wxPathExists(const char *pszPathName)
-{
-  // Windows API returns -1 from stat for "c:\dir\" if "c:\dir" exists
-  // OTOH, we should change "d:" to "d:\" and leave "\" as is.
-  wxString strPath(pszPathName);
-  if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != '\0' )
-    strPath.Last() = '\0';
-
-#ifdef __SALFORDC__
-  struct _stat st;
+    wxStructStat st;
+#ifndef __VISAGECPP__
+    return wxStat(strPath.c_str(), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR);

 #else
 #else

-  struct stat st;
+    // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only
+    return wxStat(pszPathName, &st) == 0 && (st.st_mode == S_IFDIR);

 #endif
 
 #endif
 

-  return stat((char*) (const char*) strPath, &st) == 0 && (st.st_mode & S_IFDIR);
+#endif // __WIN32__/!__WIN32__

 }
 
 // Get a temporary filename, opening and closing the file.
 }
 
 // Get a temporary filename, opening and closing the file.

-char *wxGetTempFileName(const wxString& prefix, char *buf)
+wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)

 {
 {

-#ifdef __WINDOWS__
-
-#ifndef        __WIN32__
-  char tmp[144];
-  ::GetTempFileName(0, WXSTRINGCAST prefix, 0, tmp);
-#else
-  char tmp[MAX_PATH];
-  char tmpPath[MAX_PATH];
-  ::GetTempPath(MAX_PATH, tmpPath);
-  ::GetTempFileName(tmpPath, WXSTRINGCAST prefix, 0, tmp);
-#endif
-  if (buf) strcpy(buf, tmp);
-  else buf = copystring(tmp);
-  return buf;
+    wxString filename = wxFileName::CreateTempFileName(prefix);
+    if ( filename.empty() )
+        return NULL;

 
 

-#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.
-  char 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)
-    {
-      sprintf (tmp, "/tmp/%s%d.%03x", WXSTRINGCAST prefix, (int) getpid (), (int) suffix);
-      if (!wxFileExists( tmp ))
-        {
-          // Touch the file to create it (reserve name)
-          FILE *fd = fopen (tmp, "w");
-          if (fd)
-            fclose (fd);
-          last_temp = suffix;
-          if (buf)
-            strcpy( buf, tmp);
-          else
-            buf = copystring( tmp );
-          return buf;
-        }
-    }
-  wxLogError( _("wxWindows: error finding temporary file name.\n") );
-  if (buf) buf[0] = 0;
-  return (char *) NULL;
-#endif
+    return buf;

 }
 
 }
 

-// Get first file name matching given wild card.
+bool wxGetTempFileName(const wxString& prefix, wxString& buf)
+{
+    buf = wxFileName::CreateTempFileName(prefix);

 
 

-#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.

 
 

-#ifndef __VMS__
-static DIR *wxDirStream = (DIR *) NULL;
-static char *wxFileSpec = (char *) NULL;
-static int wxFindFileFlags = 0;
-#endif
+static wxDir *gs_dir = NULL;
+static wxString gs_dirPath;

 
 

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

 {
 {

-#ifndef __VMS__
-  if (wxDirStream)
-    closedir(wxDirStream); // edz 941103: better housekeping
+    wxSplitPath(spec, &gs_dirPath, NULL, NULL);
+    if ( gs_dirPath.IsEmpty() )
+        gs_dirPath = wxT(".");
+    if ( !wxEndsWithPathSeparator(gs_dirPath ) )
+        gs_dirPath << wxFILE_SEP_PATH;

 
 

-  wxFindFileFlags = flags;
+    if (gs_dir)
+        delete gs_dir;
+    gs_dir = new wxDir(gs_dirPath);

 
 

-  if (wxFileSpec)
-    delete[] wxFileSpec;
-  wxFileSpec = copystring(spec);
-
-  // Find path only so we can concatenate
-  // found file onto path
-  char *p = wxPathOnly(wxFileSpec);
+    if ( !gs_dir->IsOpened() )
+    {
+        wxLogSysError(_("Can not enumerate files '%s'"), spec);
+        return wxEmptyString;
+    }

 
 

-  /* MATTHEW: special case: path is really "/" */
-  if (p && !*p && *wxFileSpec == '/')
-    p = "/";
-  /* MATTHEW: p is NULL => Local directory */
-  if (!p)
-    p = ".";
+    int dirFlags;
+    switch (flags)
+    {
+        case wxDIR:  dirFlags = wxDIR_DIRS; break;
+        case wxFILE: dirFlags = wxDIR_FILES; break;
+        default:     dirFlags = wxDIR_DIRS | wxDIR_FILES; break;
+    }

 
 

-  if ((wxDirStream=opendir(p))==NULL)
-    return (char *) NULL;
+    wxString result;
+    gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);
+    if ( result.IsEmpty() )
+    {
+        wxDELETE(gs_dir);
+        return result;
+    }

 
 

- /* MATTHEW: [5] wxFindNextFile can do the rest of the work */
-  return wxFindNextFile();
-#endif
- // ifndef __VMS__
-  return (char *) NULL;
+    return gs_dirPath + result;

 }
 
 }
 

-char *wxFindNextFile(void)
+wxString wxFindNextFile()

 {
 {

-#ifndef __VMS__
-  static char buf[400]; // FIXME static buffer
+    wxASSERT_MSG( gs_dir, wxT("You must call wxFindFirstFile before!") );

 
 

-  /* MATTHEW: [2] Don't crash if we read too many times */
-  if (!wxDirStream)
-    return (char *) NULL;
+    wxString result;
+    gs_dir->GetNext(&result);

 
 

-  // Find path only so we can concatenate
-  // found file onto path
-  char *p = wxPathOnly(wxFileSpec);
-  char *n = wxFileNameFromPath(wxFileSpec);
+    if ( result.IsEmpty() )
+    {
+        wxDELETE(gs_dir);
+        return result;
+    }

 
 

-  /* MATTHEW: special case: path is really "/" */
-  if (p && !*p && *wxFileSpec == '/')
-    p = "/";
+    return gs_dirPath + result;
+}

 
 

-  // Do the reading
-  struct dirent *nextDir;
-  for (nextDir = readdir(wxDirStream); nextDir != NULL; nextDir = readdir(wxDirStream))
-  {

 
 

-    /* MATTHEW: [5] Only return "." and ".." when they match, and only return
-       directories when flags & wxDIR */
-    if (wxMatchWild(n, nextDir->d_name)) {
-      bool isdir;
+// Get current working directory.
+// If buf is NULL, allocates space using new, else
+// copies into buf.
+wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
+{
+#ifdef __WXWINCE__
+    return NULL;
+#else
+    if ( !buf )
+    {
+        buf = new wxChar[sz + 1];
+    }

 
 

-      buf[0] = 0;
-      if (p && *p) {
-        strcpy(buf, p);
-        if (strcmp(p, "/") != 0)
-          strcat(buf, "/");
-      }
-      strcat(buf, nextDir->d_name);
+    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

 
 

-      if ((strcmp(nextDir->d_name, ".") == 0) ||
-          (strcmp(nextDir->d_name, "..") == 0)) {
-        if (wxFindFileFlags && !(wxFindFileFlags & wxDIR))
-          continue;
-        isdir = TRUE;
-      } else
-        isdir = wxDirExists(buf);
+    #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

 
 

-      if (!wxFindFileFlags
-          || ((wxFindFileFlags & wxDIR) && isdir)
-          || ((wxFindFileFlags & wxFILE) && !isdir))
-        return buf;
+    if ( needsANSI )
+#endif // wxUSE_UNICODE
+    {
+    #if defined(_MSC_VER) || defined(__MINGW32__)
+        ok = _getcwd(cbuf, sz) != NULL;
+    #elif defined(__WXMAC__) && !defined(__DARWIN__)
+        char lbuf[1024] ;
+        if ( getcwd( lbuf , sizeof( lbuf ) ) )
+        {
+            wxString res( lbuf , *wxConvCurrent ) ;
+            wxStrcpy( buf , res ) ;
+            ok = true;
+        }
+        else
+            ok = false ;
+    #elif defined(__OS2__)
+        APIRET rc;
+        ULONG ulDriveNum = 0;
+        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__) && !defined(__DARWIN__))
+        // finally convert the result to Unicode if needed
+        wxConvFile.MB2WC(buf, cbuf, sz);
+    #endif // wxUSE_UNICODE

     }
     }

-  }
-  closedir(wxDirStream);
-  wxDirStream = (DIR *) NULL;
-#endif
- // ifndef __VMS__

 
 

-  return (char *) NULL;
-}
+    if ( !ok )
+    {
+        wxLogSysError(_("Failed to get the working directory"));

 
 

-#elif defined(__WXMSW__)
+        // VZ: the old code used to return "." on error which didn't make any
+        //     sense at all to me - empty string is a better error indicator
+        //     (NULL might be even better but I'm afraid this could lead to
+        //     problems with the old code assuming the return is never NULL)
+        buf[0] = _T('\0');
+    }
+    else // ok, but we might need to massage the path into the right format
+    {
+#ifdef __DJGPP__
+        // VS: DJGPP is a strange mix of DOS and UNIX API and returns paths
+        //     with / deliminers. We don't like that.
+        for (wxChar *ch = buf; *ch; ch++)
+        {
+            if (*ch == wxT('/'))
+                *ch = wxT('\\');
+        }
+#endif // __DJGPP__
+
+// 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__
+    }

 
 

-#ifdef __WIN32__
-HANDLE wxFileStrucHandle = INVALID_HANDLE_VALUE;
-WIN32_FIND_DATA wxFileStruc;
-#else
-#ifdef __BORLANDC__
-static struct ffblk wxFileStruc;
-#else
-static struct _find_t wxFileStruc;
+    return buf;
+
+#if !wxUSE_UNICODE
+    #undef cbuf

 #endif
 #endif

+

 #endif
 #endif

-static wxString wxFileSpec = "";
-static int wxFindFileFlags;
+    // __WXWINCE__
+}

 
 

-char *wxFindFirstFile(const char *spec, int flags)
+wxString wxGetCwd()

 {
 {

-  wxFileSpec = spec;
-  wxFindFileFlags = flags; /* MATTHEW: [5] Remember flags */
-
-  // Find path only so we can concatenate
-  // found file onto path
-  wxString path1(wxFileSpec);
-  char *p = wxPathOnly(WXSTRINGCAST path1);
-  if (p && (strlen(p) > 0))
-         strcpy(wxBuffer, p);
-  else
-         wxBuffer[0] = 0;
-
-#ifdef __WIN32__
-  if (wxFileStrucHandle != INVALID_HANDLE_VALUE)
-         FindClose(wxFileStrucHandle);
-
-  wxFileStrucHandle = ::FindFirstFile(WXSTRINGCAST spec, &wxFileStruc);
+    wxChar *buffer = new wxChar[_MAXPATHLEN];
+    wxGetWorkingDirectory(buffer, _MAXPATHLEN);
+    wxString str( buffer );
+    delete [] buffer;

 
 

-  if (wxFileStrucHandle == INVALID_HANDLE_VALUE)
-         return NULL;
-
-  bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
+    return str;
+}

 
 

-  if (isdir && !(flags & wxDIR))
-         return wxFindNextFile();
-  else if (!isdir && flags && !(flags & wxFILE))
-         return wxFindNextFile();
+bool wxSetWorkingDirectory(const wxString& d)
+{
+#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__)

 
 

-  if (wxBuffer[0] != 0)
-         strcat(wxBuffer, "\\");
-  strcat(wxBuffer, wxFileStruc.cFileName);
-  return wxBuffer;
+#ifdef __WIN32__
+#ifdef __WXWINCE__
+    // No equivalent in WinCE
+    return false;
+#else
+    return (bool)(SetCurrentDirectory(d) != 0);
+#endif

 #else
 #else

+    // Must change drive, too.
+    bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
+    if (isDriveSpec)
+    {
+        wxChar firstChar = d[0];

 
 

-  int flag = _A_NORMAL;
-  if (flags & wxDIR) /* MATTHEW: [5] Use & */
-    flag = _A_SUBDIR;
+        // To upper case
+        if (firstChar > 90)
+            firstChar = firstChar - 32;

 
 

-#ifdef __BORLANDC__
-  if (findfirst(WXSTRINGCAST spec, &wxFileStruc, flag) == 0)
-#else
-  if (_dos_findfirst(WXSTRINGCAST spec, flag, &wxFileStruc) == 0)
-#endif
-  {
-    /* MATTHEW: [5] Check directory flag */
-    char attrib;
+        // 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);

 
 

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

 #endif
 
 #endif
 

-    if (attrib & _A_SUBDIR) {
-      if (!(wxFindFileFlags & wxDIR))
-        return wxFindNextFile();
-    } else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE))
-                return wxFindNextFile();
-
-         if (wxBuffer[0] != 0)
-                strcat(wxBuffer, "\\");
+#endif
+}

 
 

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

 #else
 #else

-         strcat(wxBuffer, wxFileStruc.name);
+    return wxEmptyString;

 #endif
 #endif

-         return wxBuffer;
-  }
-  else
-    return NULL;
-#endif // __WIN32__

 }
 
 }
 

-char *wxFindNextFile(void)
+bool wxEndsWithPathSeparator(const wxChar *pszFileName)

 {
 {

-  // Find path only so we can concatenate
-  // found file onto path
-  wxString p2(wxFileSpec);
-  char *p = wxPathOnly(WXSTRINGCAST p2);
-  if (p && (strlen(p) > 0))
-         strcpy(wxBuffer, p);
-  else
-         wxBuffer[0] = 0;
+    size_t len = wxStrlen(pszFileName);

 
 

- try_again:
+    return len && wxIsPathSeparator(pszFileName[len - 1]);
+}

 
 

-#ifdef __WIN32__
-  if (wxFileStrucHandle == INVALID_HANDLE_VALUE)
-         return NULL;
-
-  bool success = (FindNextFile(wxFileStrucHandle, &wxFileStruc) != 0);
-  if (!success) {
-                FindClose(wxFileStrucHandle);
-      wxFileStrucHandle = INVALID_HANDLE_VALUE;
-                return NULL;
-  }
+// 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
+    wxCHECK_MSG( !wxIsEmpty(pszFile), false,
+                 _T("empty file name in wxFindFileInPath"));
+
+    // skip path separator in the beginning of the file name if present
+    if ( wxIsPathSeparator(*pszFile) )
+        pszFile++;
+
+    // copy the path (strtok will modify it)
+    wxChar *szPath = new wxChar[wxStrlen(pszPath) + 1];
+    wxStrcpy(szPath, pszPath);
+
+    wxString strFile;
+    wxChar *pc, *save_ptr;
+    for ( pc = wxStrtok(szPath, wxPATH_SEP, &save_ptr);
+          pc != NULL;
+          pc = wxStrtok((wxChar *) NULL, wxPATH_SEP, &save_ptr) )
+    {
+        // search for the file in this directory
+        strFile = pc;
+        if ( !wxEndsWithPathSeparator(pc) )
+            strFile += wxFILE_SEP_PATH;
+        strFile += pszFile;
+
+        if ( wxFileExists(strFile) ) {
+            *pStr = strFile;
+            break;
+        }
+    }

 
 

-  bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
+    // suppress warning about unused variable save_ptr when wxStrtok() is a
+    // macro which throws away its third argument
+    save_ptr = pc;

 
 

-  if (isdir && !(wxFindFileFlags & wxDIR))
-    goto try_again;
-  else if (!isdir && wxFindFileFlags && !(wxFindFileFlags & wxFILE))
-         goto try_again;
+    delete [] szPath;

 
 

-  if (wxBuffer[0] != 0)
-    strcat(wxBuffer, "\\");
-  strcat(wxBuffer, wxFileStruc.cFileName);
-  return wxBuffer;
-#else
+    return pc != NULL;  // if true => we breaked from the loop
+}

 
 

-#ifdef __BORLANDC__
-  if (findnext(&wxFileStruc) == 0)
-#else
-  if (_dos_findnext(&wxFileStruc) == 0)
-#endif
-  {
-    /* MATTHEW: [5] Check directory flag */
-    char attrib;
+void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
+                             wxString *pstrPath,
+                             wxString *pstrName,
+                             wxString *pstrExt)
+{
+    // it can be empty, but it shouldn't be NULL
+    wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );

 
 

-#ifdef __BORLANDC__
-    attrib = wxFileStruc.ff_attrib;
-#else
-    attrib = wxFileStruc.attrib;
-#endif
+    wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt);
+}

 
 

-    if (attrib & _A_SUBDIR) {
-      if (!(wxFindFileFlags & wxDIR))
-        goto try_again;
-    } else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE))
-      goto try_again;
+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 (GetFileTime(fileHandle, & creationTime, & lastAccessTime, & lastWriteTime))
+        {
+            CloseHandle(fileHandle);
+
+            wxDateTime dateTime;
+            FILETIME ftLocal;
+            if ( !::FileTimeToLocalFileTime(&lastWriteTime, &ftLocal) )
+            {
+                wxLogLastError(_T("FileTimeToLocalFileTime"));
+            }

 
 

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

 
 

-         if (wxBuffer[0] != 0)
-      strcat(wxBuffer, "\\");
-#ifdef __BORLANDC__
-         strcat(wxBuffer, wxFileStruc.ff_name);
+            dateTime.Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear,
+                st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
+            return dateTime.GetTicks();
+        }
+        else
+            return 0;
+    }

 #else
 #else

-         strcat(wxBuffer, wxFileStruc.name);
-#endif
-         return wxBuffer;
-  }
-  else
-    return NULL;
+    wxStructStat buf;
+    wxStat( filename, &buf);
+
+    return buf.st_mtime;

 #endif
 }
 
 #endif
 }
 

-#endif
- // __WXMSW__

 
 

-// Get current working directory.
-// If buf is NULL, allocates space using new, else
-// copies into buf.
-char *wxGetWorkingDirectory(char *buf, int sz)
-{
-  if (!buf)
-    buf = new char[sz+1];
-#ifdef _MSC_VER
-  if (_getcwd(buf, sz) == NULL) {
-#else
-  if (getcwd(buf, sz) == NULL) {
-#endif
-    buf[0] = '.';
-    buf[1] = '\0';
-  }
-  return buf;
-}
+// Parses the filterStr, returning the number of filters.
+// Returns 0 if none or if there's a problem.
+// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"

 
 

-bool wxSetWorkingDirectory(const wxString& d)
+int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr, wxArrayString& descriptions, wxArrayString& filters)

 {
 {

-#if defined( __UNIX__ ) || defined( __WXMAC__ )
-  return (chdir(d) == 0);
-#elif defined(__WINDOWS__)
-
-#ifdef __WIN32__
-  return (bool)(SetCurrentDirectory(d) != 0);
-#else
-  // Must change drive, too.
-  bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
-  if (isDriveSpec)
-  {
-    char firstChar = d[0];
+    descriptions.Clear();
+    filters.Clear();

 
 

-    // To upper case
-    if (firstChar > 90)
-      firstChar = firstChar - 32;
+    wxString str(filterStr);

 
 

-    // To a drive number
-    unsigned int driveNo = firstChar - 64;
-    if (driveNo > 0)
+    wxString description, filter;
+    int pos = 0;
+    while( pos != wxNOT_FOUND )

     {
     {

-       unsigned int noDrives;
-       _dos_setdrive(driveNo, &noDrives);
-    }
-  }
-  bool success = (chdir(WXSTRINGCAST d) == 0);
+        pos = str.Find(wxT('|'));
+        if ( pos == wxNOT_FOUND )
+        {
+            // if there are no '|'s at all in the string just take the entire
+            // string as filter and make description empty for later autocompletion
+            if ( filters.IsEmpty() )
+            {
+                descriptions.Add(wxEmptyString);
+                filters.Add(filterStr);
+            }
+            else
+            {
+                wxFAIL_MSG( _T("missing '|' in the wildcard string!") );
+            }

 
 

-  return success;
-#endif
+            break;
+        }

 
 

-#endif
-}
+        description = str.Left(pos);
+        str = str.Mid(pos + 1);
+        pos = str.Find(wxT('|'));
+        if ( pos == wxNOT_FOUND )
+        {
+            filter = str;
+        }
+        else
+        {
+            filter = str.Left(pos);
+            str = str.Mid(pos + 1);
+        }

 
 

-bool wxEndsWithPathSeparator(const char *pszFileName)
-{
-  size_t len = Strlen(pszFileName);
-  if ( len == 0 )
-    return FALSE;
-  else
-    return wxIsPathSeparator(pszFileName[len - 1]);
-}
+        descriptions.Add(description);
+        filters.Add(filter);
+    }

 
 

-// find a file in a list of directories, returns false if not found
-bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile)
-{
-  // we assume that it's not empty
-  wxCHECK_MSG( !IsEmpty(pszFile), FALSE,
-               _("empty file name in wxFindFileInPath"));
-
-  // skip path separator in the beginning of the file name if present
-  if ( wxIsPathSeparator(*pszFile) )
-    pszFile++;
-
-  // copy the path (strtok will modify it)
-  char *szPath = new char[strlen(pszPath) + 1];
-  strcpy(szPath, pszPath);
-
-  wxString strFile;
-  char *pc;
-  for ( pc = strtok(szPath, PATH_SEP); pc; pc = strtok((char *) NULL, PATH_SEP) ) {
-    // search for the file in this directory
-    strFile = pc;
-    if ( !wxEndsWithPathSeparator(pc) )
-      strFile += FILE_SEP_PATH;
-    strFile += pszFile;
-
-    if ( FileExists(strFile) ) {
-      *pStr = strFile;
-      break;
+#if defined(__WXMOTIF__)
+    // split it so there is one wildcard per entry
+    for( size_t i = 0 ; i < descriptions.GetCount() ; i++ )
+    {
+        pos = filters[i].Find(wxT(';'));
+        if (pos != wxNOT_FOUND)
+        {
+            // first split only filters
+            descriptions.Insert(descriptions[i],i+1);
+            filters.Insert(filters[i].Mid(pos+1),i+1);
+            filters[i]=filters[i].Left(pos);
+
+            // autoreplace new filter in description with pattern:
+            //     C/C++ Files(*.cpp;*.c;*.h)|*.cpp;*.c;*.h
+            // cause split into:
+            //     C/C++ Files(*.cpp)|*.cpp
+            //     C/C++ Files(*.c;*.h)|*.c;*.h
+            // and next iteration cause another split into:
+            //     C/C++ Files(*.cpp)|*.cpp
+            //     C/C++ Files(*.c)|*.c
+            //     C/C++ Files(*.h)|*.h
+            for ( size_t k=i;k<i+2;k++ )
+            {
+                pos = descriptions[k].Find(filters[k]);
+                if (pos != wxNOT_FOUND)
+                {
+                    wxString before = descriptions[k].Left(pos);
+                    wxString after = descriptions[k].Mid(pos+filters[k].Len());
+                    pos = before.Find(_T('('),true);
+                    if (pos>before.Find(_T(')'),true))
+                    {
+                        before = before.Left(pos+1);
+                        before << filters[k];
+                        pos = after.Find(_T(')'));
+                        int pos1 = after.Find(_T('('));
+                        if (pos != wxNOT_FOUND && (pos<pos1 || pos1==wxNOT_FOUND))
+                        {
+                            before << after.Mid(pos);
+                            descriptions[k] = before;
+                        }
+                    }
+                }
+            }
+        }

     }
     }

-  }
+#endif

 
 

-  delete [] szPath;
+    // autocompletion
+    for( size_t j = 0 ; j < descriptions.GetCount() ; j++ )
+    {
+        if ( descriptions[j] == wxEmptyString && filters[j] != wxEmptyString )
+        {
+            descriptions[j].Printf(_("Files (%s)"), filters[j].c_str());
+        }
+    }

 
 

-  return pc != NULL;  // if true => we breaked from the loop
+    return filters.GetCount();

 }
 
 }
 

-void WXDLLEXPORT wxSplitPath(const char *pszFileName,
-                             wxString *pstrPath,
-                             wxString *pstrName,
-                             wxString *pstrExt)
-{
-  wxCHECK_RET( pszFileName, "NULL file name in wxSplitPath" );
-
-  const char *pDot = strrchr(pszFileName, FILE_SEP_EXT);
-  const char *pSepUnix = strrchr(pszFileName, FILE_SEP_PATH_UNIX);
-  const char *pSepDos = strrchr(pszFileName, FILE_SEP_PATH_DOS);
-
-  // take the last of the two: nPosUnix containts the last slash in the
-  // filename
-  size_t nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;
-  size_t nPosDos = pSepDos ? pSepDos - pszFileName : 0;
-  if ( nPosDos > nPosUnix )
-    nPosUnix = nPosDos;
-
-  if ( pstrPath )
-    *pstrPath = wxString(pszFileName, nPosUnix);
-
-  size_t nPosDot = 0;
-  if ( pDot )
-    nPosDot = pDot - pszFileName;
-
-  if ( nPosDot > nPosUnix ) {
-    // the file name looks like "path/name.ext"
-    if ( pstrName )
-      *pstrName = wxString(pszFileName + nPosUnix + 1, nPosDot - nPosUnix);
-    if ( pstrExt )
-      *pstrExt = wxString(pszFileName + nPosDot + 1);
-  }
-  else {
-    // there is either no dot at all or there is a '/' after it
-    if ( pstrName )
-      *pstrName = wxString(pszFileName + nPosUnix + 1);
-    if ( pstrExt )
-      pstrExt->Empty();
-  }
-}

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


@@ -1542,171 +1713,149 @@ void WXDLLEXPORT wxSplitPath(const char *pszFileName,
 
 bool wxIsWild( const wxString& pattern )
 {
 
 bool wxIsWild( const wxString& pattern )
 {

-  wxString tmp = pattern;
-  char *pat = WXSTRINGCAST(tmp);
-    while (*pat) {
-        switch (*pat++) {
-        case '?': case '*': case '[': case '{':
-            return TRUE;
-        case '\\':
+    wxString tmp = pattern;
+    wxChar *pat = WXSTRINGCAST(tmp);
+    while (*pat)
+    {
+        switch (*pat++)
+        {
+        case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
+            return true;
+        case wxT('\\'):

             if (!*pat++)
             if (!*pat++)

-                return FALSE;
+                return false;

         }
     }
         }
     }

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

 
 

-bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
+/*
+* Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
+*
+* The match procedure is public domain code (from ircII's reg.c)
+*/

 
 

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

 {
 {

-   if(dot_special)
-      return fnmatch(pat.c_str(), text.c_str(), FNM_PERIOD) == 0;
-   else
-      return fnmatch(pat.c_str(), text.c_str(), 0) == 0;
-}
-#else
+        if (text.empty())
+        {
+                /* Match if both are empty. */
+                return pat.empty();
+        }

 
 

-// #pragma error Broken implementation of wxMatchWild() -- needs fixing!
+        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;
+        }

 
 

-   /*
-    * WARNING: this code is broken!
-    */
-{
-  wxString tmp1 = pat;
-  char *pattern = WXSTRINGCAST(tmp1);
-  wxString tmp2 = text;
-  char *str = WXSTRINGCAST(tmp2);
-    char c;
-    char *cp;
-    bool done = FALSE, ret_code, ok;
-    // Below is for vi fans
-    const char OB = '{', CB = '}';
-
-    // dot_special means '.' only matches '.'
-    if (dot_special && *str == '.' && *pattern != *str)
-        return FALSE;
-
-    while ((*pattern != '\0') && (!done)
-    && (((*str=='\0')&&((*pattern==OB)||(*pattern=='*')))||(*str!='\0'))) {
-        switch (*pattern) {
-        case '\\':
-            pattern++;
-            if (*pattern != '\0')
-                pattern++;
-            break;
-        case '*':
-            pattern++;
-            ret_code = FALSE;
-            while ((*str!='\0')
-            && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
-                /*loop*/;
-            if (ret_code) {
-                while (*str != '\0')
-                    str++;
-                while (*pattern != '\0')
-                    pattern++;
-            }
-            break;
-        case '[':
-            pattern++;
-          repeat:
-            if ((*pattern == '\0') || (*pattern == ']')) {
-                done = TRUE;
-                break;
-            }
-            if (*pattern == '\\') {
-                pattern++;
-                if (*pattern == '\0') {
-                    done = TRUE;
-                    break;
-                }
-            }
-            if (*(pattern + 1) == '-') {
-                c = *pattern;
-                pattern += 2;
-                if (*pattern == ']') {
-                    done = TRUE;
-                    break;
-                }
-                if (*pattern == '\\') {
-                    pattern++;
-                    if (*pattern == '\0') {
-                        done = TRUE;
-                        break;
-                    }
-                }
-                if ((*str < c) || (*str > *pattern)) {
-                    pattern++;
-                    goto repeat;
+        for (;;)
+        {
+                if (*m == wxT('*'))
+                {
+                        ma = ++m;
+                        na = n;
+                        just = 1;
+                        mp = NULL;
+                        acount = count;

                 }
                 }

-            } else if (*pattern != *str) {
-                pattern++;
-                goto repeat;
-            }
-            pattern++;
-            while ((*pattern != ']') && (*pattern != '\0')) {
-                if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
-                    pattern++;
-                pattern++;
-            }
-            if (*pattern != '\0') {
-                pattern++, str++;
-            }
-            break;
-        case '?':
-            pattern++;
-            str++;
-            break;
-        case OB:
-            pattern++;
-            while ((*pattern != CB) && (*pattern != '\0')) {
-                cp = str;
-                ok = TRUE;
-                while (ok && (*cp != '\0') && (*pattern != '\0')
-                &&  (*pattern != ',') && (*pattern != CB)) {
-                    if (*pattern == '\\')
-                        pattern++;
-                    ok = (*pattern++ == *cp++);
+                else if (*m == wxT('?'))
+                {
+                        m++;
+                        if (!*n++)
+                        return false;

                 }
                 }

-                if (*pattern == '\0') {
-                    ok = FALSE;
-                    done = TRUE;
-                    break;
-                } else if (ok) {
-                    str = cp;
-                    while ((*pattern != CB) && (*pattern != '\0')) {
-                        if (*++pattern == '\\') {
-                            if (*++pattern == CB)
-                                pattern++;
+                else
+                {
+                        if (*m == wxT('\\'))
+                        {
+                                m++;
+                                /* Quoting "nothing" is a bad thing */
+                                if (!*m)
+                                return false;

                         }
                         }

-                    }
-                } else {
-                    while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
-                        if (*++pattern == '\\') {
-                            if (*++pattern == CB || *pattern == ',')
-                                pattern++;
+                        if (!*m)
+                        {
+                                /*
+                                * If we are out of both strings or we just
+                                * saw a wildcard, then we can say we have a
+                                * match
+                                */
+                                if (!*n)
+                                return true;
+                                if (just)
+                                return true;
+                                just = 0;
+                                goto not_matched;
+                        }
+                        /*
+                        * 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 != '\0')
-                    pattern++;
-            }
-            break;
-        default:
-            if (*str == *pattern) {
-                str++, pattern++;
-            } else {
-                done = TRUE;
-            }

         }
         }

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

 
 

-#endif

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