Fixes for GNUPro 00r1

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 90b49c111d04b1ac6dd5cf708f972a910db11f56..79c63f4bade52bbc06c08b246cde8471097c3137 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 license

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

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "filefn.h"
+    #pragma implementation "filefn.h"

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


@@ -18,101 +26,181 @@
 #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"
+#include "wx/filename.h"
+#include "wx/dir.h"
+
+// there are just too many of those...
+#ifdef __VISUALC__
+    #pragma warning(disable:4706)   // assignment within conditional expression
+#endif // VC++

 
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #if !defined(__WATCOMC__)
 
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #if !defined(__WATCOMC__)

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

 #endif
 #endif

+
+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers

 #endif
 #endif

+

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

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

 
 

-#ifdef __UNIX__
-#include <unistd.h>
-#include <dirent.h>
+#ifndef __MWERKS__
+    #include <sys/types.h>
+    #include <sys/stat.h>
+#else
+    #include <stat.h>
+    #include <unistd.h>
+    #include <unix.h>

 #endif
 
 #endif
 

-#ifdef __WXMSW__
-#ifndef __GNUWIN32__
-#include <direct.h>
-#include <dos.h>
-#endif
+#ifdef __UNIX__
+    #include <unistd.h>
+    #include <dirent.h>

 #endif
 
 #endif
 

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

 
 

-#ifndef __MINGW32__
-#include <std.h>
+#if defined(__DOS__)
+    #ifdef __WATCOMC__
+        #include <direct.h>
+        #include <dos.h>
+        #include <io.h>
+    #endif
+    #ifdef __DJGPP__
+        #include <unistd.h>
+    #endif

 #endif
 
 #endif
 

-#define stricmp strcasecmp
+#ifdef __GNUWIN32__
+    #include <wchar.h>
+    #ifndef __TWIN32__
+        #include <sys/unistd.h>
+    #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.
 #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>
+    #include <dir.h>

 #endif
 
 #endif
 

-#ifdef __WXMSW__
-#include "windows.h"
+#ifdef __SALFORDC__
+    #include <dir.h>
+    #include <unix.h>
+#endif
+
+#include "wx/setup.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__
+    #include <windows.h>

 #endif
 
 #endif
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+

 #define _MAXPATHLEN 500
 
 #define _MAXPATHLEN 500
 

-#if !USE_SHARED_LIBRARY
+extern wxChar *wxBuffer;
+
+#ifdef __WXMAC__
+#    include "MoreFiles.h"
+#    include "MoreFilesExtras.h"
+#    include "FullPath.h"
+#    include "FSpCompat.h"
+#endif
+

 IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
 IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)

+
+// ----------------------------------------------------------------------------
+// private globals
+// ----------------------------------------------------------------------------
+
+static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
+
+#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
 

-extern char *wxBuffer;
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// we need to translate Mac filenames before passing them to OS functions
+#define OS_FILENAME(s) (s.fn_str())
+
+// ============================================================================
+// implementation
+// ============================================================================

 
 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 __WXMSW__
-       " ;"; // Don't seperate with colon in DOS (used for drive)
+  static const wxChar PATH_TOKS[] =
+#ifdef __WINDOWS__
+        wxT(" ;"); // Don't seperate with colon in DOS (used for drive)

 #else
 #else

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

 #endif
 
 #endif
 

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

   if (val && *val)
     {
   if (val && *val)
     {

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

 
       if (token)
 
       if (token)

-       {
-         Add (copystring (token));
-         while (token)
-           {
-             if ((token = strtok (NULL, PATH_TOKS)) != NULL)
-               Add (wxString(token));
-           }
-       }
-      delete[]s;
+      {
+          Add (copystring (token));
+          while (token)
+          {
+              if ((token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr)) != NULL)
+                  Add (wxString(token));
+          }
+      }
+
+      // suppress warning about unused variable save_ptr when wxStrtok() is a
+      // macro which throws away its third argument
+      save_ptr = token;
+
+      delete [] s;

     }
 }
 
     }
 }
 


@@ -121,130 +209,129 @@ 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)
 {
   for (wxNode * node = First (); node != NULL; node = node->Next ())
   {
 }
 
 bool wxPathList::Member (const wxString& path)
 {
   for (wxNode * node = First (); node != NULL; node = node->Next ())
   {

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

       if (
       if (

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

       // Case INDEPENDENT
       // Case INDEPENDENT

-         path.CompareTo (path2, wxString::ignoreCase) == 0
+          path.CompareTo (path2, wxString::ignoreCase) == 0

 #else
 #else

-      // Case sensitive File System 
-         path.CompareTo (path2) == 0
+      // Case sensitive File System
+          path.CompareTo (path2) == 0

 #endif
 #endif

-       )
-       return TRUE;
+        )
+        return TRUE;

   }
   return FALSE;
 }
 
 wxString wxPathList::FindValidPath (const wxString& file)
 {
   }
   return FALSE;
 }
 
 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 = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (char *)buf;
+  wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
+  filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;

 
   for (wxNode * node = First (); node; node = node->Next ())
     {
 
   for (wxNode * node = First (); node; node = node->Next ())
     {

-      char *path = (char *) node->Data ();
-      strcpy (wxBuffer, path);
-      char ch = wxBuffer[strlen(wxBuffer)-1];
-      if (ch != '\\' && ch != '/')
-        strcat (wxBuffer, "/");
-      strcat (wxBuffer, filename);
-#ifdef __WXMSW__
-      Unix2DosFilename (wxBuffer);
-#endif
-      if (wxFileExists (wxBuffer))
+      wxChar *path = (wxChar *) node->Data ();
+      wxStrcpy (wxFileFunctionsBuffer, path);
+      wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
+      if (ch != wxT('\\') && ch != wxT('/'))
+        wxStrcat (wxFileFunctionsBuffer, wxT("/"));
+      wxStrcat (wxFileFunctionsBuffer, filename);
+#ifdef __WINDOWS__
+      Unix2DosFilename (wxFileFunctionsBuffer);
+#endif
+      if (wxFileExists (wxFileFunctionsBuffer))

       {
       {

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

       }
       }

-    }                          // for()
+    }                                // for()

 
 

-  return wxString("");                 // Not found
+  return wxString(wxT(""));                    // 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 ( wxIsAbsolutePath(f) )
+        return f;
+
+    wxString buf;
+    wxGetWorkingDirectory(buf.GetWriteBuf(_MAXPATHLEN), _MAXPATHLEN - 1);
+    buf.UngetWriteBuf();
+    if ( !wxEndsWithPathSeparator(buf) )

     {
     {

-#ifdef __WXMSW__
-      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 
+bool

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

-  struct stat stbuf;
-
-  if (filename && stat ((char *)(const char *)filename, &stbuf) == 0)
-    return TRUE;
-  return FALSE;
-}
-
-/* Vadim's alternative implementation
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+    // GetFileAttributes can copy with network paths
+    DWORD ret = GetFileAttributes(filename);
+    DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY);
+    return ((ret != 0xffffffff) && (isDir == 0));
+#else
+    wxStructStat stbuf;
+    if ( !filename.empty() && wxStat (OS_FILENAME(filename), &stbuf) == 0 )
+        return TRUE;

 
 

-// does the file exist?
-bool wxFileExists(const char *pszFileName)
-{
-  struct stat st;
-  return !access(pszFileName, 0) &&
-         !stat(pszFileName, &st) &&
-         (st.st_mode & S_IFREG);
+    return FALSE;
+#endif

 }
 }

-*/

 
 

-bool 
+bool

 wxIsAbsolutePath (const wxString& filename)
 {
 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 __WXMSW__
-      /* MSDOS */
-      || filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
+#ifdef __WINDOWS__
+        // MSDOS like
+        if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
+            return TRUE;

 #endif
 #endif

-       )
-       return TRUE;

     }
     }

-  return FALSE;
+    return FALSE ;

 }
 
 /*
 }
 
 /*


@@ -252,14 +339,14 @@ wxIsAbsolutePath (const wxString& filename)
  * IF one exists. Inserts zero into buffer.
  *
  */
  * IF one exists. Inserts zero into buffer.
  *
  */

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


@@ -274,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;


@@ -284,79 +371,79 @@ 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 = '\\';
+  static const wxChar SEP = wxT('\\');

   Unix2DosFilename(path);
 #else
   Unix2DosFilename(path);
 #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];
     for (; *p; p++)
       {
       p = &path[0];
     else
       p = &path[2];
     for (; *p; p++)
       {

-       if (*p == SEP)
-         {
-           if (p[1] == '.' && p[2] == '.' && (p[3] == SEP || p[3] == '\0'))
-             {
-                char *q;
-               for (q = p - 1; q >= path && *q != SEP; q--);
-               if (q[0] == SEP && (q[1] != '.' || q[2] != '.' || q[3] != SEP)
-                   && (q - 1 <= path || q[-1] != SEP))
-                 {
-                   strcpy (q, p + 3);
-                   if (path[0] == '\0')
-                     {
-                       path[0] = SEP;
-                       path[1] = '\0';
-                     }
+        if (*p == SEP)
+          {
+            if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
+              {
+                wxChar *q;
+                for (q = p - 1; q >= path && *q != SEP; q--);
+                if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP)
+                    && (q - 1 <= path || q[-1] != SEP))
+                  {
+                    wxStrcpy (q, p + 3);
+                    if (path[0] == wxT('\0'))
+                      {
+                        path[0] = SEP;
+                        path[1] = wxT('\0');
+                      }

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-                   /* Check that path[2] is NULL! */
-                   else if (path[1] == ':' && !path[2])
-                     {
-                       path[2] = SEP;
-                       path[3] = '\0';
-                     }
-#endif
-                   p = q - 1;
-                 }
-             }
-           else if (p[1] == '.' && (p[2] == SEP || p[2] == '\0'))
-             strcpy (p, p + 2);
-         }
+                    /* Check that path[2] is NULL! */
+                    else if (path[1] == wxT(':') && !path[2])
+                      {
+                        path[2] = SEP;
+                        path[3] = wxT('\0');
+                      }
+#endif
+                    p = q - 1;
+                  }
+              }
+            else if (p[1] == wxT('.') && (p[2] == SEP || p[2] == wxT('\0')))
+              wxStrcpy (p, p + 2);
+          }

       }
   }
   return path;
 }
 
 // Must be destroyed
       }
   }
   return path;
 }
 
 // Must be destroyed

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

 {
 {

-  if (filename == "")
-    return 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 (! IsAbsolutePath(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);
+    wxStrcat(buf, wxFileFunctionsBuffer);

     return copystring( wxRealPath(buf) );
   }
     return copystring( wxRealPath(buf) );
   }

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

 }
 
 /*-
 }
 
 /*-


@@ -365,151 +452,169 @@ char *wxCopyAbsolutePath(const wxString& filename)
    ~user/ => user's home dir
    If the environment variable a = "foo" and b = "bar" then:
    Unix:
    ~user/ => user's home dir
    If the environment variable a = "foo" and b = "bar" then:
    Unix:

-       $a      =>      foo
-       $a$b    =>      foobar
-       $a.c    =>      foo.c
-       xxx$a   =>      xxxfoo
-       ${a}!   =>      foo!
-       $(b)!   =>      bar!
-       \$a     =>      \$a
+        $a        =>        foo
+        $a$b        =>        foobar
+        $a.c        =>        foo.c
+        xxx$a        =>        xxxfoo
+        ${a}!        =>        foo!
+        $(b)!        =>        bar!
+        \$a        =>        \$a

    MSDOS:
    MSDOS:

-       $a      ==>     $a
-       $(a)    ==>     foo
-       $(a)$b  ==>     foo$b
-       $(a)$(b)==>     foobar
-       test.$$ ==>     test.$$
+        $a        ==>        $a
+        $(a)        ==>        foo
+        $(a)$b        ==>        foo$b
+        $(a)$(b)==>        foobar
+        test.$$        ==>        test.$$

  */
 
 /* 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')
-       return buf;
+    buf[0] = wxT('\0');
+    if (name == NULL || *name == wxT('\0'))
+        return buf;

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

-    char *nm_tmp = nm;
+    wxChar *nm_tmp = nm;

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

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

     /* And strip off trailing whitespace and cr */
     /* 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 == '\\') {
-           if ((*(d - 1) = *++s)) {
-               s++;
-               continue;
-           } else
-               break;
-       } else
+#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
+#  endif

 #endif
 #ifdef __WXMSW__
 #endif
 #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        braces = (*s == '{' || *s == '(');
-           register char  *value;
-           while ((*d++ = *s))
-               if (braces ? (*s == '}' || *s == ')') : !(isalnum(*s) || *s == '_') )
-                   break;
-               else
-                   s++;
-           *--d = 0;
-           value = getenv(braces ? start + 1 : start);
-           if (value) {
-               for ((d = start - 1); (*d++ = *value++););
-               d--;
-               if (braces && *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;
+            value = wxGetenv(braces ? start + 1 : start);
+            if (value) {
+                for ((d = start - 1); (*d++ = *value++) != 0;);
+                d--;
+                if (braces && *s)
+                    s++;
+            }
+        }

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

-    s = "";
-    if (nm[0] == '~' && !q)
+    s = wxT("");
+    if (nm[0] == wxT('~') && !q)

     {
     {

-       /* prefix ~ */
-       if (nm[1] == SEP || nm[1] == 0)
-        {      /* ~/filename */
-           if ((s = wxGetUserHome("")) != NULL) {
-               if (*++nm)
-                   nm++;
-           }
+        /* prefix ~ */
+        if (nm[1] == SEP || nm[1] == 0)
+        {        /* ~/filename */
+        // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+            if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) {
+                if (*++nm)
+                    nm++;
+            }

         } else
         } else

-        {              /* ~user/filename */
-           register char  *nnm;
-           register char  *home;
-           for (s = nm; *s && *s != SEP; s++);
-           int was_sep; /* MATTHEW: Was there a separator, or NULL? */
+        {                /* ~user/filename */
+            register wxChar  *nnm;
+            register wxChar  *home;
+            for (s = nm; *s && *s != SEP; s++);
+            int was_sep; /* MATTHEW: Was there a separator, or NULL? */

             was_sep = (*s == SEP);
             was_sep = (*s == SEP);

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

                if (was_sep) /* replace only if it was there: */
                if (was_sep) /* replace only if it was there: */

-                 *s = SEP;
-               s = "";
-           } else {
-               nm = nnm;
-               s = home;
-           }
-       }
+                   *s = SEP;
+                s = wxT("");
+            } else {
+                nm = nnm;
+                s = home;
+            }
+        }

     }
 
     d = buf;
     if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */
     }
 
     d = buf;
     if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */

-       /* Copy home dir */
-       while ('\0' != (*d++ = *s++))
-         /* loop */;
-       // Handle root home
-       if (d - 1 > buf && *(d - 2) != SEP)
-         *(d - 1) = SEP;
+        /* Copy home dir */
+        while (wxT('\0') != (*d++ = *s++))
+          /* loop */;
+        // Handle root home
+        if (d - 1 > buf && *(d - 2) != SEP)
+          *(d - 1) = SEP;

     }
     s = nm;
     }
     s = nm;

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

     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:
 


@@ -517,49 +622,49 @@ 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 NULL;
+  if (filename == wxT(""))
+    return (wxChar *) NULL;

 
 

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

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

-  char *val = NULL;
-  char *tcp = NULL;
-  if (envname != NULL && (val = getenv (WXSTRINGCAST envname)) != NULL &&
-     (tcp = strstr (dest, val)) != NULL)
+  const wxChar *val = (const wxChar *) NULL;
+  wxChar *tcp = (wxChar *) NULL;
+  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);

     }
 
   // Handle User's home (ignore root homes!)
   size_t len = 0;
   if ((val = wxGetUserHome (user)) != NULL &&
     }
 
   // 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)
+      (len = wxStrlen(val)) > 2 &&
+      wxStrncmp(dest, val, len) == 0)

     {
     {

-      strcpy(wxBuffer, "~");
-      if (user && *user)
-       strcat(wxBuffer, user);
+      wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
+      if (user != wxT(""))
+             wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-//      strcat(wxBuffer, "\\");
+//      strcat(wxFileFunctionsBuffer, "\\");

 #else
 #else

-//      strcat(wxBuffer, "/");
+//      strcat(wxFileFunctionsBuffer, "/");

 #endif
 #endif

-      strcat(wxBuffer, dest + len);
-      strcpy (dest, wxBuffer);
+      wxStrcat(wxFileFunctionsBuffer, dest + len);
+      wxStrcpy (dest, wxFileFunctionsBuffer);

     }
 
   return dest;
     }
 
   return dest;


@@ -567,214 +672,383 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
 
 // Return just the filename, not the path
 // (basename)
 
 // Return just the filename, not the path
 // (basename)

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

 {
 {

-  if (path)
+    if (path)

     {
     {

-      register char *tcp;
-
-      tcp = path + strlen (path);
-      while (--tcp >= path)
-       {
-         if (*tcp == '/' || *tcp == '\\'
-#ifdef __VMS__
-     || *tcp == ':' || *tcp == ']')
+        register wxChar *tcp;
+        
+        tcp = path + wxStrlen (path);
+        while (--tcp >= path)
+        {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+            // Classic or Carbon CodeWarrior like
+            // Carbon with Apple DevTools is Unix like
+            if (*tcp == wxT(':'))
+                return tcp + 1;

 #else
 #else

-     )
+            // Unix like or Windows
+            if (*tcp == wxT('/') || *tcp == wxT('\\'))
+                return tcp + 1;

 #endif
 #endif

-           return tcp + 1;
-       }                       /* while */
-#ifdef __WXMSW__
-      if (isalpha (*path) && *(path + 1) == ':')
-       return path + 2;
+#ifdef __VMS__
+            if (*tcp == wxT(':') || *tcp == wxT(']'))
+                return tcp + 1;
+#endif
+        } /* while */
+#if defined(__WXMSW__) || defined(__WXPM__)
+        // MSDOS like
+        if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
+            return path + 2;

 #endif
     }
 #endif
     }

-  return path;
+    return path;

 }
 
 wxString wxFileNameFromPath (const wxString& path1)
 {
 }
 
 wxString wxFileNameFromPath (const wxString& path1)
 {

-  if (path1 != "")
-  {
-
-      char *path = WXSTRINGCAST path1 ;
-      register char *tcp;
-
-      tcp = path + strlen (path);
-      while (--tcp >= path)
-         {
-           if (*tcp == '/' || *tcp == '\\'
-#ifdef __VMS__
-        || *tcp == ':' || *tcp == ']')
+    if (path1 != wxT(""))
+    {
+        wxChar *path = WXSTRINGCAST path1 ;
+        register wxChar *tcp;
+        
+        tcp = path + wxStrlen (path);
+        while (--tcp >= path)
+        {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+            // Classic or Carbon CodeWarrior like
+            // Carbon with Apple DevTools is Unix like
+            if (*tcp == wxT(':') )
+                return wxString(tcp + 1);

 #else
 #else

-        )
+            // Unix like or Windows
+            if (*tcp == wxT('/') || *tcp == wxT('\\'))
+                return wxString(tcp + 1);

 #endif
 #endif

-               return wxString(tcp + 1);
-           }                   /* while */
-#ifdef __WXMSW__
-      if (isalpha (*path) && *(path + 1) == ':')
-           return wxString(path + 2);
+#ifdef __VMS__
+            if (*tcp == wxT(':') || *tcp == wxT(']'))
+                return wxString(tcp + 1);
+#endif
+        } /* while */
+#if defined(__WXMSW__) || defined(__WXPM__)
+        // MSDOS like
+        if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
+            return wxString(path + 2);

 #endif
     }
 #endif
     }

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

 }
 
 // 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);
-
-      int l = strlen(path);
-      bool done = FALSE;
-
-      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] == ']')
+        static wxChar buf[_MAXPATHLEN];
+        
+        // Local copy
+        wxStrcpy (buf, path);
+        
+        int l = wxStrlen(path);
+        int i = l - 1;
+        
+        // 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 --;
+        }
+        
+#if defined(__WXMSW__) || defined(__WXPM__)
+        // Try Drive specifier
+        if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
+        {
+            // A:junk --> A:. (since A:.\junk Not A:\junk)
+            buf[2] = wxT('.');
+            buf[3] = wxT('\0');
+            return buf;

         }
         }

-        else i --;
-      }
-
-#ifdef __WXMSW__
-      // Try Drive specifier
-      if (isalpha (buf[0]) && buf[1] == ':')
-       {
-         // A:junk --> A:. (since A:.\junk Not A:\junk)
-         buf[2] = '.';
-         buf[3] = '\0';
-         return buf;
-       }

 #endif
     }
 #endif
     }

-
-  return 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
+        wxStrcpy (buf, WXSTRINGCAST path);
+        
+        int l = path.Length();
+        int i = l - 1;
+
+        // Search backward for a backward or forward slash
+        while (i > -1)
+        {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+            // Classic or Carbon CodeWarrior like
+            // Carbon with Apple DevTools is Unix like
+            if (path[i] == wxT(':') )
+            {
+                buf[i] = 0;
+                return wxString(buf);
+            }
+#else
+            // Unix like or Windows
+            if (path[i] == wxT('/') || path[i] == wxT('\\'))
+            {
+                buf[i] = 0;
+                return wxString(buf);
+            }
+#endif
+#ifdef __VMS__
+            if (path[i] == wxT(']'))
+            {
+                buf[i+1] = 0;
+                return wxString(buf);
+            }
+#endif
+            i --;
+        }
+        
+#if defined(__WXMSW__) || defined(__WXPM__)
+        // Try Drive specifier
+        if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
+        {
+            // A:junk --> A:. (since A:.\junk Not A:\junk)
+            buf[2] = wxT('.');
+            buf[3] = wxT('\0');
+            return wxString(buf);
+        }
+#endif
+    }
+    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.

 
 

-      // Local copy
-      strcpy (buf, WXSTRINGCAST path);
+#if defined(__WXMAC__)
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
+{
+#ifdef __DARWIN__
+    FSRef theRef;
+    char  thePath[FILENAME_MAX];
+
+    // convert the FSSpec to an FSRef
+    (void) FSpMakeFSRef( spec, &theRef );
+    // get the POSIX path associated with the FSRef
+    (void) FSRefMakePath( &theRef, (UInt8 *)thePath, sizeof(thePath) );
+    
+    // create path string for return value
+    wxString result( thePath ) ;
+#else
+    Handle    myPath ;
+    short     length ;
+
+    // get length of path and allocate handle
+    FSpGetFullPath( spec , &length , &myPath ) ;
+    ::SetHandleSize( myPath , length + 1 ) ;
+    ::HLock( myPath ) ;
+    (*myPath)[length] = 0 ;
+    if ((length > 0) && ((*myPath)[length-1] == ':'))
+        (*myPath)[length-1] = 0 ;
+    
+    // create path string for return value
+    wxString result( (char*) *myPath ) ;

 
 

-      int l = path.Length();
-      bool done = FALSE;
+    // free allocated handle
+    ::HUnlock( myPath ) ;
+    ::DisposeHandle( myPath ) ;
+#endif

 
 

-      int i = l - 1;
+    return result ;
+}

 
 

-      // Search backward for a backward or forward slash
-      while (!done && i > -1)
-      {
-        // ] is for VMS
-        if (path[i] == '/' || path[i] == '\\' || path[i] == ']')
-        {
-          done = TRUE;
-#ifdef __VMS__
-          buf[i+1] = 0;
+void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
+{
+#ifdef __DARWIN__
+    FSRef theRef;
+
+    // get the FSRef associated with the POSIX path
+    (void) FSPathMakeRef((const UInt8 *) path, &theRef, NULL);
+    // convert the FSRef to an FSSpec
+    (void) FSGetCatalogInfo(&theRef, kFSCatInfoNone, NULL, NULL, spec, NULL);

 #else
 #else

-          buf[i] = 0;
+    FSpLocationFromFullPath( strlen(path) , path , spec ) ;

 #endif
 #endif

+}

 
 

-          return wxString(buf);
+#ifndef __DARWIN__
+// Mac file names are POSIX (Unix style) under Darwin
+// therefore the conversion functions below are not needed
+
+static char sMacFileNameConversion[ 1000 ] ;
+
+wxString wxMac2UnixFilename (const char *str)
+{
+    char *s = sMacFileNameConversion ;
+    strcpy( s , str ) ;
+    if (s)
+    {
+        memmove( s+1 , s ,strlen( s ) + 1) ;
+        if ( *s == ':' )
+            *s = '.' ;
+        else
+            *s = '/' ;
+        
+        while (*s)
+        {
+            if (*s == ':')
+                *s = '/';
+            else
+                *s = wxTolower(*s);        // Case INDEPENDENT
+            s++;

         }
         }

-        else i --;
-      }
+    }
+    return wxString(sMacFileNameConversion) ;
+}

 
 

-#ifdef __WXMSW__
-      // Try Drive specifier
-      if (isalpha (buf[0]) && buf[1] == ':')
-       {
-         // A:junk --> A:. (since A:.\junk Not A:\junk)
-         buf[2] = '.';
-         buf[3] = '\0';
-         return wxString(buf);
-       }
-#endif
+wxString wxUnix2MacFilename (const char *str)
+{
+    char *s = sMacFileNameConversion ;
+    strcpy( s , str ) ;
+    if (s)
+    {
+        if ( *s == '.' )
+        {
+            // relative path , since it goes on with slash which is translated to a :
+            memmove( s , s+1 ,strlen( s ) ) ;
+        }
+        else if ( *s == '/' )
+        {
+            // absolute path -> on mac just start with the drive name
+            memmove( s , s+1 ,strlen( s ) ) ;
+        }
+        else
+        {
+            wxASSERT_MSG( 1 , "unkown path beginning" ) ;
+        }
+        while (*s)
+        {
+            if (*s == '/' || *s == '\\')
+            {
+                // convert any back-directory situations
+                if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) )
+                {
+                    *s = ':';
+                    memmove( s+1 , s+3 ,strlen( s+3 ) + 1 ) ;
+                }
+                else
+                    *s = ':';
+            }
+            s++ ;
+        }

     }
     }

+    return wxString (sMacFileNameConversion) ;
+}

 
 

-  return wxString("");
+wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
+{
+    return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;

 }
 
 }
 

-// 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.
+void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
+{
+    wxString var = wxUnix2MacFilename( path ) ;
+    wxMacFilename2FSSpec( var , spec ) ;
+}
+#endif // ! __DARWIN__

 
 

-void 
+#endif // __WXMAC__
+
+void

 wxDos2UnixFilename (char *s)
 {
   if (s)
     while (*s)
       {
 wxDos2UnixFilename (char *s)
 {
   if (s)
     while (*s)
       {

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

 #ifdef __WXMSW__
 #ifdef __WXMSW__

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

 #endif
 #endif

-       s++;
+        s++;

       }
 }
 
       }
 }
 

-void 
-#ifdef __WXMSW__
-wxUnix2DosFilename (char *s)
+void
+#if defined(__WXMSW__) || defined(__WXPM__)
+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(__WXPM__)

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

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

       }
 #endif
 }
 
 // Concatenate two files to form third
       }
 #endif
 }
 
 // Concatenate two files to form third

-bool 
+bool

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

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

 
 

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

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

-  if ((fp1 = fopen (WXSTRINGCAST file1, "rb")) == NULL ||
-      (fp2 = fopen (WXSTRINGCAST file2, "rb")) == NULL ||
-      (fp3 = fopen (outfile, "wb")) == NULL)
+  if ((fp1 = wxFopen (OS_FILENAME( file1 ), wxT("rb"))) == NULL ||
+      (fp2 = wxFopen (OS_FILENAME( file2 ), wxT("rb"))) == NULL ||
+      (fp3 = wxFopen (OS_FILENAME( outfile ), wxT("wb"))) == NULL)

     {
       if (fp1)
     {
       if (fp1)

-       fclose (fp1);
+        fclose (fp1);

       if (fp2)
       if (fp2)

-       fclose (fp2);
+        fclose (fp2);

       if (fp3)
       if (fp3)

-       fclose (fp3);
+        fclose (fp3);

       return FALSE;
     }
 
       return FALSE;
     }
 


@@ -789,40 +1063,113 @@ 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
   return result;
 }
 
 // Copy files

-bool 
-wxCopyFile (const wxString& file1, const wxString& file2)
+bool
+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
+    return ::CopyFile(file1, file2, !overwrite) != 0;
+#elif defined(__WXPM__)
+    if (::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) == 0)
+        return TRUE;
+    else
+        return FALSE;
+#else // !Win32
+    wxStructStat fbuf;

 
 

-  if ((fd1 = fopen (WXSTRINGCAST file1, "rb")) == NULL)
-    return FALSE;
-  if ((fd2 = fopen (WXSTRINGCAST file2, "wb")) == NULL)
+    // get permissions of file1
+    if ( wxStat(OS_FILENAME(file1), &fbuf) != 0 )

     {
     {

-      fclose (fd1);
-      return FALSE;
+        // the file probably doesn't exist or we haven't the rights to read
+        // from it anyhow
+        wxLogSysError(_("Impossible to get permissions for file '%s'"),
+                      file1.c_str());
+        return FALSE;
+    }
+
+    // open file1 for reading
+    wxFile fileIn(file1, wxFile::read);
+    if ( !fileIn.IsOpened() )
+        return FALSE;
+
+    // remove file2, if it exists. This is needed for creating
+    // file2 with the correct permissions in the next step
+    if ( wxFileExists(file2)  && (!overwrite || !wxRemoveFile(file2)))
+    {
+        wxLogSysError(_("Impossible to overwrite the file '%s'"),
+                      file2.c_str());
+        return FALSE;
+    }
+
+#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;
+
+        // end of file?
+        if ( !count )
+            break;
+
+        if ( fileOut.Write(buf, count) < count )
+            return FALSE;

     }
 
     }
 

-  while ((ch = getc (fd1)) != EOF)
-    (void) putc (ch, fd2);
+    // 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

 
 

-  fclose (fd1);
-  fclose (fd2);
-  return TRUE;
+    return TRUE;
+#endif // __WXMSW__ && __WIN32__

 }
 
 }
 

-bool 
+bool

 wxRenameFile (const wxString& file1, const wxString& file2)
 {
   // Normal system call
 wxRenameFile (const wxString& file1, const wxString& file2)
 {
   // Normal system call

-  if (0 == rename (WXSTRINGCAST file1, WXSTRINGCAST file2))
+  if ( wxRename (file1, file2) == 0 )

     return TRUE;
     return TRUE;

+

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


@@ -834,433 +1181,303 @@ wxRenameFile (const wxString& file1, const wxString& file2)
 
 bool wxRemoveFile(const wxString& file)
 {
 
 bool wxRemoveFile(const wxString& file)
 {

-#if defined(_MSC_VER) || defined(__BORLANDC__)
-  int flag = remove(WXSTRINGCAST file);
+#if defined(__VISUALC__) \
+ || defined(__BORLANDC__) \
+ || defined(__WATCOMC__) \
+ || defined(__GNUWIN32__)
+  int res = wxRemove(file);

 #else
 #else

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

 #endif
 #endif

-  return (flag == 0) ;
-}

 
 

-bool wxMkdir(const wxString& dir)
-{
-#ifdef __VMS__
-       return FALSE;
-#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);
-#else
-  return (mkdir(WXSTRINGCAST dir) == 0);
-#endif
+  return res == 0;

 }
 
 }
 

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

 {
 {

-#ifdef __VMS__
-  return FALSE;
-#else
-  return (rmdir(WXSTRINGCAST dir) == 0);
-#endif
+#if defined(__WXMAC__) && !defined(__UNIX__)
+  return (mkdir( 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(__WXPM__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WXMICROWIN__)
+    if ( mkdir(wxFNCONV(dirname), perm) != 0 )
+#elif defined(__WXPM__)
+    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;
+    if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
+#endif // !MSW/MSW
+    {
+        wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
+
+        return FALSE;
+    }
+
+    return TRUE;
+#endif // Mac/!Mac

 }
 
 }
 

-#if 0
-bool wxDirExists(const wxString& dir)
+bool wxRmdir(const wxString& dir, int WXUNUSED(flags))

 {
 #ifdef __VMS__
 {
 #ifdef __VMS__

-  return FALSE;
-#elif !defined(__WXMSW__)
-  struct stat sbuf;
-  return (stat(dir, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE;
+  return FALSE; //to be changed since rmdir exists in VMS7.x
+#elif defined(__WXPM__)
+  return (::DosDeleteDir((PSZ)dir.c_str()) == 0);

 #else
 
 #else
 

-  /* MATTHEW: [6] Always use same code for Win32, call FindClose */
-#if defined(__WIN32__)
-  WIN32_FIND_DATA fileInfo;
-#else
-#ifdef __BORLANDC__
-  struct ffblk fileInfo;
+#ifdef __SALFORDC__
+  return FALSE; // What to do?

 #else
 #else

-  struct find_t fileInfo;
+  return (wxRmDir(OS_FILENAME(dir)) == 0);

 #endif
 #endif

+

 #endif
 #endif

+}
+
+// does the path exists? (may have or not '/' or '\\' at the end)
+bool wxPathExists(const wxChar *pszPathName)
+{
+    wxString strPath(pszPathName);
+#ifdef __WINDOWS__
+    // 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));
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+    // Stat can't cope with network paths
+    DWORD ret = GetFileAttributes(strPath.c_str());
+    DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY);
+    return ((ret != 0xffffffff) && (isDir != 0));

 #else
 #else

-  return (((_dos_findfirst(WXSTRINGCAST dir, _A_SUBDIR, &fileInfo) == 0) && (fileInfo.attrib & _A_SUBDIR)) != 0);
-#endif
-#endif

 
 

+    wxStructStat st;
+#ifndef __VISAGECPP__
+    return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 &&
+        ((st.st_mode & S_IFMT) == S_IFDIR);
+#else
+    // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only
+    return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 &&
+        (st.st_mode == S_IFDIR);

 #endif
 #endif

-}

 
 #endif
 
 #endif

-
-// 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';
-
-  struct stat st;
-  return stat(strPath, &st) == 0 && (st.st_mode & S_IFDIR);

 }
 
 // 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 __WXMSW__
-
-#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];
+    if ( buf )
+        wxStrcpy(buf, filename);
+    else
+        buf = copystring(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;
-       }
-    }
-  cerr << _("wxWindows: error finding temporary file name.\n");
-  if (buf) buf[0] = 0;
-  return 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 = NULL;
-static char *wxFileSpec = 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
-
-  wxFindFileFlags = flags;
-
-  if (wxFileSpec)
-    delete[] wxFileSpec;
-  wxFileSpec = copystring(spec);
-
-  // Find path only so we can concatenate
-  // found file onto path
-  char *p = wxPathOnly(wxFileSpec);
-
-  /* MATTHEW: special case: path is really "/" */
-  if (p && !*p && *wxFileSpec == '/')
-    p = "/";
-  /* MATTHEW: p is NULL => Local directory */
-  if (!p)
-    p = ".";
+    gs_dirPath = wxPathOnly(spec);
+    if ( gs_dirPath.IsEmpty() )
+        gs_dirPath = wxT(".");
+    if ( gs_dirPath.Last() != wxFILE_SEP_PATH )
+        gs_dirPath << wxFILE_SEP_PATH;
+
+    if (gs_dir)
+        delete gs_dir;
+    gs_dir = new wxDir(gs_dirPath);
+    
+    if ( !gs_dir->IsOpened() )
+    {
+        wxLogSysError(_("Can not enumerate files '%s'"), spec);
+        return wxEmptyString;
+    }
+    
+    int dirFlags = 0;
+    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 NULL;
+    wxString result;
+    gs_dir->GetFirst(&result, wxFileNameFromPath(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 NULL;
+    return gs_dirPath + result;

 }
 
 }
 

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

 {
 {

-#ifndef __VMS__
-  static char buf[400];
-
-  /* MATTHEW: [2] Don't crash if we read too many times */
-  if (!wxDirStream)
-    return NULL;
-
-  // Find path only so we can concatenate
-  // found file onto path
-  char *p = wxPathOnly(wxFileSpec);
-  char *n = wxFileNameFromPath(wxFileSpec);
-
-  /* MATTHEW: special case: path is really "/" */
-  if (p && !*p && *wxFileSpec == '/')
-    p = "/";
-
-  // Do the reading
-  struct dirent *nextDir;
-  for (nextDir = readdir(wxDirStream); nextDir != NULL; nextDir = readdir(wxDirStream))
-  {
+    wxASSERT_MSG( gs_dir, wxT("You must call wxFindFirstFile before!") );

 
 

-    /* MATTHEW: [5] Only return "." and ".." when they match, and only return
-       directories when flags & wxDIR */
-    if (wxMatchWild(n, nextDir->d_name)) {
-      bool isdir;
-
-      buf[0] = 0;
-      if (p && *p) {
-        strcpy(buf, p);
-        if (strcmp(p, "/") != 0)
-          strcat(buf, "/");
-      }
-      strcat(buf, nextDir->d_name);
-
-      if ((strcmp(nextDir->d_name, ".") == 0) ||
-         (strcmp(nextDir->d_name, "..") == 0)) {
-       if (wxFindFileFlags && !(wxFindFileFlags & wxDIR))
-         continue;
-       isdir = TRUE;
-      } else
-       isdir = wxDirExists(buf);
-      
-      if (!wxFindFileFlags
-         || ((wxFindFileFlags & wxDIR) && isdir)
-         || ((wxFindFileFlags & wxFILE) && !isdir))
-       return buf;
+    wxString result;
+    gs_dir->GetNext(&result);
+    
+    if ( result.IsEmpty() )
+    {
+        wxDELETE(gs_dir);
+        return result;

     }
     }

-  }
-  closedir(wxDirStream);
-  wxDirStream = NULL;
-#endif
- // ifndef __VMS__
-
-  return NULL;
+    
+    return gs_dirPath + result;

 }
 
 }
 

-#elif defined(__WXMSW__)
-
-#ifdef __WIN32__
-HANDLE wxFileStrucHandle = INVALID_HANDLE_VALUE;
-WIN32_FIND_DATA wxFileStruc;
-#else
-#ifdef __BORLANDC__
-static struct ffblk wxFileStruc;
-#else
-static struct _find_t wxFileStruc;
-#endif
-#endif
-static wxString wxFileSpec = "";
-static int wxFindFileFlags;

 
 

-char *wxFindFirstFile(const char *spec, int flags)
+// Get current working directory.
+// If buf is NULL, allocates space using new, else
+// copies into buf.
+wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)

 {
 {

-  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);
-
-  if (wxFileStrucHandle == INVALID_HANDLE_VALUE)
-        return NULL;
-
-  bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
-
-  if (isdir && !(flags & wxDIR))
-        return wxFindNextFile();
-  else if (!isdir && flags && !(flags & wxFILE))
-        return wxFindNextFile();
-
-  if (wxBuffer[0] != 0)
-        strcat(wxBuffer, "\\");
-  strcat(wxBuffer, wxFileStruc.cFileName);
-  return wxBuffer;
-#else
-
-  int flag = _A_NORMAL;
-  if (flags & wxDIR) /* MATTHEW: [5] Use & */
-    flag = _A_SUBDIR;
-
-#ifdef __BORLANDC__
-  if (findfirst(WXSTRINGCAST spec, &wxFileStruc, flag) == 0)
+  if (!buf)
+    buf = new wxChar[sz+1];
+#if wxUSE_UNICODE
+  char *cbuf = new char[sz+1];
+#ifdef _MSC_VER
+  if (_getcwd(cbuf, sz) == NULL) {
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    enum
+    {
+        SFSaveDisk = 0x214, CurDirStore = 0x398
+    };
+    FSSpec cwdSpec ;
+
+    FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
+    wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+    strcpy( buf , res ) ;
+    if (0) {

 #else
 #else

-  if (_dos_findfirst(WXSTRINGCAST spec, flag, &wxFileStruc) == 0)
+  if (getcwd(cbuf, sz) == NULL) {

 #endif
 #endif

-  {
-    /* MATTHEW: [5] Check directory flag */
-    char attrib;
+    delete [] cbuf;
+#else // wxUnicode
+#ifdef _MSC_VER
+  if (_getcwd(buf, sz) == NULL) {
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    FSSpec cwdSpec ;
+    FCBPBRec pb;
+    OSErr error;
+    Str255  fileName ;
+    pb.ioNamePtr = (StringPtr) &fileName;
+    pb.ioVRefNum = 0;
+    pb.ioRefNum = LMGetCurApRefNum();
+    pb.ioFCBIndx = 0;
+    error = PBGetFCBInfoSync(&pb);
+    if ( error == noErr )
+    {
+        cwdSpec.vRefNum = pb.ioFCBVRefNum;
+        cwdSpec.parID = pb.ioFCBParID;
+        cwdSpec.name[0] = 0 ;
+        wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;

 
 

-#ifdef __BORLANDC__
-    attrib = wxFileStruc.ff_attrib;
+        strcpy( buf , res ) ;
+        buf[res.length()]=0 ;
+    }
+    else
+        buf[0] = 0 ;
+    /*
+    this version will not always give back the application directory on mac
+    enum
+    {
+        SFSaveDisk = 0x214, CurDirStore = 0x398
+    };
+    FSSpec cwdSpec ;
+
+    FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
+    wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+    strcpy( buf , res ) ;
+    */
+    if (0) {
+#elif defined(__VISAGECPP__) || (defined (__OS2__) && defined (__WATCOMC__))
+    APIRET rc;
+    rc = ::DosQueryCurrentDir( 0 // current drive
+                              ,buf
+                              ,(PULONG)&sz
+                             );
+    if (rc != 0) {

 #else
 #else

-    attrib = wxFileStruc.attrib;
+  if (getcwd(buf, sz) == NULL) {

 #endif
 #endif

-
-    if (attrib & _A_SUBDIR) {
-      if (!(wxFindFileFlags & wxDIR))
-       return wxFindNextFile();
-    } else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE))
-               return wxFindNextFile();
-
-        if (wxBuffer[0] != 0)
-               strcat(wxBuffer, "\\");
-
-#ifdef __BORLANDC__
-        strcat(wxBuffer, wxFileStruc.ff_name);
-#else
-        strcat(wxBuffer, wxFileStruc.name);

 #endif
 #endif

-        return wxBuffer;
+    buf[0] = wxT('.');
+    buf[1] = wxT('\0');

   }
   }

-  else
-    return NULL;
-#endif // __WIN32__
-}
-
-char *wxFindNextFile(void)
-{
-  // 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;
-  
- try_again:
-
-#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;
+#if wxUSE_UNICODE
+  else {
+    wxConvFile.MB2WC(buf, cbuf, sz);
+    delete [] cbuf;

   }
   }

-
-  bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
-
-  if (isdir && !(wxFindFileFlags & wxDIR))
-    goto try_again;
-  else if (!isdir && wxFindFileFlags && !(wxFindFileFlags & wxFILE))
-        goto try_again;
-
-  if (wxBuffer[0] != 0)
-    strcat(wxBuffer, "\\");
-  strcat(wxBuffer, wxFileStruc.cFileName);
-  return wxBuffer;  
-#else
-
-#ifdef __BORLANDC__
-  if (findnext(&wxFileStruc) == 0)
-#else
-  if (_dos_findnext(&wxFileStruc) == 0)

 #endif
 #endif

-  {
-    /* MATTHEW: [5] Check directory flag */
-    char attrib;

 
 

-#ifdef __BORLANDC__
-    attrib = wxFileStruc.ff_attrib;
-#else
-    attrib = wxFileStruc.attrib;
+#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
 
 #endif
 

-    if (attrib & _A_SUBDIR) {
-      if (!(wxFindFileFlags & wxDIR))
-       goto try_again;
-    } else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE))
-      goto try_again;
-
-
-        if (wxBuffer[0] != 0)
-      strcat(wxBuffer, "\\");
-#ifdef __BORLANDC__
-        strcat(wxBuffer, wxFileStruc.ff_name);
-#else
-        strcat(wxBuffer, wxFileStruc.name);
-#endif
-        return wxBuffer;
-  }
-  else
-    return NULL;
-#endif
+  return buf;

 }
 
 }
 

-#endif
- // __WXMSW__
-
-// Get current working directory.
-// If buf is NULL, allocates space using new, else
-// copies into buf.
-char *wxGetWorkingDirectory(char *buf, int sz)
+wxString wxGetCwd()

 {
 {

-  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;
+    static const size_t maxPathLen = 1024;
+
+    wxString str;
+    wxGetWorkingDirectory(str.GetWriteBuf(maxPathLen), maxPathLen);
+    str.UngetWriteBuf();
+
+    return str;

 }
 
 bool wxSetWorkingDirectory(const wxString& d)
 {
 }
 
 bool wxSetWorkingDirectory(const wxString& d)
 {

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

 
 #ifdef __WIN32__
   return (bool)(SetCurrentDirectory(d) != 0);
 
 #ifdef __WIN32__
   return (bool)(SetCurrentDirectory(d) != 0);


@@ -1269,7 +1486,7 @@ bool wxSetWorkingDirectory(const wxString& d)
   bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
   if (isDriveSpec)
   {
   bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
   if (isDriveSpec)
   {

-    char firstChar = d[0];
+    wxChar firstChar = d[0];

 
     // To upper case
     if (firstChar > 90)
 
     // To upper case
     if (firstChar > 90)


@@ -1291,81 +1508,286 @@ bool wxSetWorkingDirectory(const wxString& d)
 #endif
 }
 
 #endif
 }
 

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

 {
 {

-  size_t len = Strlen(pszFileName);
-  if ( len == 0 )
-    return FALSE;
-  else
-    return wxIsPathSeparator(pszFileName[len - 1]);
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+    wxChar buf[256];
+    GetWindowsDirectory(buf, 256);
+    return wxString(buf);
+#else
+    return wxEmptyString;
+#endif
+}
+
+bool wxEndsWithPathSeparator(const wxChar *pszFileName)
+{
+    size_t len = wxStrlen(pszFileName);
+
+    return len && wxIsPathSeparator(pszFileName[len - 1]);

 }
 
 // find a file in a list of directories, returns false if not found
 }
 
 // find a file in a list of directories, returns false if not found

-bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile)
+bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *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(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;
+    // 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 ( FileExists(strFile) ) {
+            *pStr = strFile;
+            break;
+        }

     }
     }

-  }

 
 

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

 
 

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

 }
 
 }
 

-void WXDLLEXPORT wxSplitPath(const char *pszFileName,
+void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,

                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt)
 {
                              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
-  uint nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;
-  uint nPosDos = pSepDos ? pSepDos - pszFileName : 0;
-  if ( nPosDos > nPosUnix )
-    nPosUnix = nPosDos;
-//  uint nLen = Strlen(pszFileName);
-
-  if ( pstrPath )
-    *pstrPath = wxString(pszFileName, nPosUnix);
-  if ( pDot ) {
-    uint nPosDot = pDot - pszFileName;
-    if ( pstrName )
-      *pstrName = wxString(pszFileName + nPosUnix + 1, nPosDot - nPosUnix);
-    if ( pstrExt )
-      *pstrExt = wxString(pszFileName + nPosDot + 1);
-  }
-  else {
-    if ( pstrName )
-      *pstrName = wxString(pszFileName + nPosUnix + 1);
-    if ( pstrExt )
-      pstrExt->Empty();
-  }
+    // it can be empty, but it shouldn't be NULL
+    wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );
+
+    wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt);
+}
+
+time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+{
+    wxStructStat buf;
+
+    wxStat(filename.fn_str(), &buf);
+    return buf.st_mtime;
+}
+
+
+//------------------------------------------------------------------------
+// wild character routines
+//------------------------------------------------------------------------
+
+bool wxIsWild( const wxString& pattern )
+{
+  wxString tmp = pattern;
+  wxChar *pat = WXSTRINGCAST(tmp);
+    while (*pat) {
+        switch (*pat++) {
+        case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
+            return TRUE;
+        case wxT('\\'):
+            if (!*pat++)
+                return FALSE;
+        }
+    }
+    return FALSE;
+};
+
+bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
+
+#if defined(HAVE_FNMATCH_H)
+{
+// this probably won't work well for multibyte chars in Unicode mode?
+   if(dot_special)
+      return fnmatch(pat.fn_str(), text.fn_str(), FNM_PERIOD) == 0;
+   else
+      return fnmatch(pat.fn_str(), text.fn_str(), 0) == 0;

 }
 }

+#else
+
+// #pragma error Broken implementation of wxMatchWild() -- needs fixing!
+
+   /*
+    * WARNING: this code is broken!
+    */
+{
+  wxString tmp1 = pat;
+  wxChar *pattern = WXSTRINGCAST(tmp1);
+  wxString tmp2 = text;
+  wxChar *str = WXSTRINGCAST(tmp2);
+    wxChar c;
+    wxChar *cp;
+    bool done = FALSE, ret_code, ok;
+    // Below is for vi fans
+    const wxChar OB = wxT('{'), CB = wxT('}');
+
+    // dot_special means '.' only matches '.'
+    if (dot_special && *str == wxT('.') && *pattern != *str)
+        return FALSE;
+
+    while ((*pattern != wxT('\0')) && (!done)
+    && (((*str==wxT('\0'))&&((*pattern==OB)||(*pattern==wxT('*'))))||(*str!=wxT('\0')))) {
+        switch (*pattern) {
+        case wxT('\\'):
+            pattern++;
+            if (*pattern != wxT('\0'))
+                pattern++;
+            break;
+        case wxT('*'):
+            pattern++;
+            ret_code = FALSE;
+            while ((*str!=wxT('\0'))
+            && ((ret_code=wxMatchWild(pattern, str++, FALSE)) == 0))
+                /*loop*/;
+            if (ret_code) {
+                while (*str != wxT('\0'))
+                    str++;
+                while (*pattern != wxT('\0'))
+                    pattern++;
+            }
+            break;
+        case wxT('['):
+            pattern++;
+          repeat:
+            if ((*pattern == wxT('\0')) || (*pattern == wxT(']'))) {
+                done = TRUE;
+                break;
+            }
+            if (*pattern == wxT('\\')) {
+                pattern++;
+                if (*pattern == wxT('\0')) {
+                    done = TRUE;
+                    break;
+                }
+            }
+            if (*(pattern + 1) == wxT('-')) {
+                c = *pattern;
+                pattern += 2;
+                if (*pattern == wxT(']')) {
+                    done = TRUE;
+                    break;
+                }
+                if (*pattern == wxT('\\')) {
+                    pattern++;
+                    if (*pattern == wxT('\0')) {
+                        done = TRUE;
+                        break;
+                    }
+                }
+                if ((*str < c) || (*str > *pattern)) {
+                    pattern++;
+                    goto repeat;
+                }
+            } else if (*pattern != *str) {
+                pattern++;
+                goto repeat;
+            }
+            pattern++;
+            while ((*pattern != wxT(']')) && (*pattern != wxT('\0'))) {
+                if ((*pattern == wxT('\\')) && (*(pattern + 1) != wxT('\0')))
+                    pattern++;
+                pattern++;
+            }
+            if (*pattern != wxT('\0')) {
+                pattern++, str++;
+            }
+            break;
+        case wxT('?'):
+            pattern++;
+            str++;
+            break;
+        case OB:
+            pattern++;
+            while ((*pattern != CB) && (*pattern != wxT('\0'))) {
+                cp = str;
+                ok = TRUE;
+                while (ok && (*cp != wxT('\0')) && (*pattern != wxT('\0'))
+                &&  (*pattern != wxT(',')) && (*pattern != CB)) {
+                    if (*pattern == wxT('\\'))
+                        pattern++;
+                    ok = (*pattern++ == *cp++);
+                }
+                if (*pattern == wxT('\0')) {
+                    ok = FALSE;
+                    done = TRUE;
+                    break;
+                } else if (ok) {
+                    str = cp;
+                    while ((*pattern != CB) && (*pattern != wxT('\0'))) {
+                        if (*++pattern == wxT('\\')) {
+                            if (*++pattern == CB)
+                                pattern++;
+                        }
+                    }
+                } else {
+                    while (*pattern!=CB && *pattern!=wxT(',') && *pattern!=wxT('\0')) {
+                        if (*++pattern == wxT('\\')) {
+                            if (*++pattern == CB || *pattern == wxT(','))
+                                pattern++;
+                        }
+                    }
+                }
+                if (*pattern != wxT('\0'))
+                    pattern++;
+            }
+            break;
+        default:
+            if (*str == *pattern) {
+                str++, pattern++;
+            } else {
+                done = TRUE;
+            }
+        }
+    }
+    while (*pattern == wxT('*'))
+        pattern++;
+    return ((*str == wxT('\0')) && (*pattern == wxT('\0')));
+};
+
+#endif
+
+#ifdef __VISUALC__
+    #pragma warning(default:4706)   // assignment within conditional expression
+#endif // VC++
+
+//------------------------------------------------------------------------
+// Missing functions in Unicode for Win9x
+//------------------------------------------------------------------------
+
+// NB: MSLU only covers Win32 API, it doesn't provide Unicode implementation of
+//     libc functions. Unfortunately, some of MSVCRT wchar_t functions
+//     (e.g. _wopen) don't work on Windows 9x, so we have to workaround it
+//     by calling the char version. We still want to use wchar_t version on
+//     NT/2000/XP, though, because they allow for Unicode file names.
+#if wxUSE_UNICODE_MSLU
+
+    #if defined( __VISUALC__ ) \
+        || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
+        || ( defined(__MWERKS__) && defined(__WXMSW__) )
+    WXDLLEXPORT int wxOpen(const wxChar *name, int flags, int mode)
+    {
+        if ( wxGetOsVersion() == wxWINDOWS_NT )
+            return _wopen(name, flags, mode);
+        else
+            return _open(wxConvFile.cWX2MB(name), flags, mode);
+    }
+    #endif
+
+#endif // wxUSE_UNICODE_MSLU