toplevel code transferred to wxTopLevelWindow

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 7461ca1dd46ec5a3a04b260c497afd56f213e256..c8b6040148df31cc83f9aa96ed2c12b4da05abe0 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -9,6 +9,14 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -21,12 +29,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

 #include "wx/utils.h"
 #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__
 
 // there are just too many of those...
 #ifdef __VISUALC__


@@ -51,6 +58,7 @@
 #else
     #include <stat.h>
     #include <unistd.h>
 #else
     #include <stat.h>
     #include <unistd.h>

+    #include <unix.h>

 #endif
 
 #ifdef __UNIX__
 #endif
 
 #ifdef __UNIX__


@@ -58,23 +66,34 @@
     #include <dirent.h>
 #endif
 
     #include <dirent.h>
 #endif
 

-#ifdef __OS2__
-    #include <direct.h>
+#ifdef __WXPM__

     #include <process.h>
     #include <process.h>

+    #include "wx/os2/private.h"

 #endif
 #endif

-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)

 #if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
     #include <direct.h>
     #include <dos.h>
 #if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
     #include <direct.h>
     #include <dos.h>

+    #include <io.h>

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

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

 #ifdef __GNUWIN32__
 #ifdef __GNUWIN32__

+    #include <wchar.h>

     #ifndef __TWIN32__
         #include <sys/unistd.h>
     #endif
     #ifndef __TWIN32__
         #include <sys/unistd.h>
     #endif

-
-    #define stricmp strcasecmp

 #endif
 
 #ifdef __BORLANDC__ // Please someone tell me which version of Borland needs
 #endif
 
 #ifdef __BORLANDC__ // Please someone tell me which version of Borland needs


@@ -97,22 +116,51 @@
 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__

-    #include "windows.h"
+    #include <windows.h>

 #endif
 
 #endif
 

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

 #define _MAXPATHLEN 500
 
 extern wxChar *wxBuffer;
 #define _MAXPATHLEN 500
 
 extern wxChar *wxBuffer;

+

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-    extern wxChar gwxMacFileName[] ;
-    extern wxChar gwxMacFileName2[] ;
-    extern wxChar gwxMacFileName3[] ;
+#    include "MoreFiles.h"
+#    include "MoreFilesExtras.h"
+#    include "FullPath.h"
+#    include "FSpCompat.h"

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARIES
-    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
 

+// ----------------------------------------------------------------------------
+// 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)
 {
     wxStringList::Add (WXSTRINGCAST path);
 void wxPathList::Add (const wxString& path)
 {
     wxStringList::Add (WXSTRINGCAST path);


@@ -123,9 +171,9 @@ void wxPathList::AddEnvList (const wxString& envVariable)
 {
   static const wxChar PATH_TOKS[] =
 #ifdef __WINDOWS__
 {
   static const wxChar PATH_TOKS[] =
 #ifdef __WINDOWS__

-        _T(" ;"); // Don't seperate with colon in DOS (used for drive)
+        wxT(" ;"); // Don't seperate with colon in DOS (used for drive)

 #else
 #else

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

 #endif
 
   wxChar *val = wxGetenv (WXSTRINGCAST envVariable);
 #endif
 
   wxChar *val = wxGetenv (WXSTRINGCAST envVariable);


@@ -135,15 +183,20 @@ void wxPathList::AddEnvList (const wxString& envVariable)
       wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
 
       if (token)
       wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
 
       if (token)

-        {
+      {

           Add (copystring (token));
           while (token)
           Add (copystring (token));
           while (token)

-            {
+          {

               if ((token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr)) != NULL)
               if ((token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr)) != NULL)

-                Add (wxString(token));
-            }
-        }
-      delete[]s;
+                  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;

     }
 }
 
     }
 }
 


@@ -181,11 +234,11 @@ bool wxPathList::Member (const wxString& path)
 
 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);

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

-  wxStrcpy(buf, wxBuffer);
+  wxStrcpy(buf, wxFileFunctionsBuffer);

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


@@ -193,108 +246,88 @@ wxString wxPathList::FindValidPath (const wxString& file)
   for (wxNode * node = First (); node; node = node->Next ())
     {
       wxChar *path = (wxChar *) node->Data ();
   for (wxNode * node = First (); node; node = node->Next ())
     {
       wxChar *path = (wxChar *) node->Data ();

-      wxStrcpy (wxBuffer, path);
-      wxChar ch = wxBuffer[wxStrlen(wxBuffer)-1];
-      if (ch != _T('\\') && ch != _T('/'))
-        wxStrcat (wxBuffer, _T("/"));
-      wxStrcat (wxBuffer, filename);
+      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);
+      Unix2DosFilename (wxFileFunctionsBuffer);

 #endif
 #endif

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

       {
       {

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

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

-  return wxString(_T(""));                    // 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
-  {
-    wxChar buf[500];
-    wxGetWorkingDirectory(buf, 499);
-    int len = (int)wxStrlen(buf);
-    wxChar lastCh = 0;
-    if (len > 0)
-      lastCh = buf[len-1];
-    if (lastCh != _T('/') && lastCh != _T('\\'))
+    wxString f = FindValidPath(file);
+    if ( wxIsAbsolutePath(f) )
+        return f;
+
+    wxString buf;
+    wxGetWorkingDirectory(buf.GetWriteBuf(_MAXPATHLEN), _MAXPATHLEN - 1);
+    buf.UngetWriteBuf();
+    if ( !wxEndsWithPathSeparator(buf) )

     {
     {

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

     }
     }

-    wxStrcat(buf, (const wxChar *)f);
-    wxStrcpy(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;
-        wxStrcpy( gwxMacFileName , filename ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-          if (gwxMacFileName && stat (WXSTRINGCAST gwxMacFileName, &stbuf) == 0)
-            return TRUE;
-    return FALSE ;
+#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
 #else

+    wxStructStat stbuf;
+    if ( !filename.empty() && wxStat (OS_FILENAME(filename), &stbuf) == 0 )
+        return TRUE;

 
 

-#ifdef __SALFORDC__
-  struct _stat stbuf;
-#else
-  struct stat stbuf;
-#endif
-
-  if ((filename != _T("")) && stat (FNSTRINGCAST filename.fn_str(), &stbuf) == 0)
-    return TRUE;
-  return FALSE;
+    return FALSE;

 #endif
 }
 
 #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);
-}
-*/
-

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

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

     {
     {

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

 #endif
 #ifdef __WINDOWS__
 #endif
 #ifdef __WINDOWS__

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

 #endif
 #endif

-        )
-        return TRUE;

     }
     }

-  return FALSE;
+    return FALSE ;

 }
 
 /*
 }
 
 /*


@@ -309,7 +342,7 @@ void wxStripExtension(wxChar *buffer)
   int i = len-1;
   while (i > 0)
   {
   int i = len-1;
   while (i > 0)
   {

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

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


@@ -324,7 +357,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) == _T('.'))
+    if (buffer.GetChar(i) == wxT('.'))

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


@@ -337,15 +370,15 @@ void wxStripExtension(wxString& buffer)
 wxChar *wxRealPath (wxChar *path)
 {
 #ifdef __WXMSW__
 wxChar *wxRealPath (wxChar *path)
 {
 #ifdef __WXMSW__

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

   Unix2DosFilename(path);
 #else
   Unix2DosFilename(path);
 #else

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

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

-    if (path[2] == SEP && path[1] == _T('.'))
+    if (path[2] == SEP && path[1] == wxT('.'))

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


@@ -353,31 +386,31 @@ wxChar *wxRealPath (wxChar *path)
       {
         if (*p == SEP)
           {
       {
         if (*p == SEP)
           {

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

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

-                if (q[0] == SEP && (q[1] != _T('.') || q[2] != _T('.') || q[3] != SEP)
+                if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP)

                     && (q - 1 <= path || q[-1] != SEP))
                   {
                     wxStrcpy (q, p + 3);
                     && (q - 1 <= path || q[-1] != SEP))
                   {
                     wxStrcpy (q, p + 3);

-                    if (path[0] == _T('\0'))
+                    if (path[0] == wxT('\0'))

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

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

                       }
 #ifdef __WXMSW__
                     /* Check that path[2] is NULL! */
                       }
 #ifdef __WXMSW__
                     /* Check that path[2] is NULL! */

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

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

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

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

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

               wxStrcpy (p, p + 2);
           }
       }
               wxStrcpy (p, p + 2);
           }
       }


@@ -388,25 +421,25 @@ wxChar *wxRealPath (wxChar *path)
 // Must be destroyed
 wxChar *wxCopyAbsolutePath(const wxString& filename)
 {
 // Must be destroyed
 wxChar *wxCopyAbsolutePath(const wxString& filename)
 {

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

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

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

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

-    buf[0] = _T('\0');
+    buf[0] = wxT('\0');

     wxGetWorkingDirectory(buf, WXSIZEOF(buf));
     wxChar ch = buf[wxStrlen(buf) - 1];
 #ifdef __WXMSW__
     wxGetWorkingDirectory(buf, WXSIZEOF(buf));
     wxChar ch = buf[wxStrlen(buf) - 1];
 #ifdef __WXMSW__

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

 #else
 #else

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

 #endif
 #endif

-    wxStrcat(buf, wxBuffer);
+    wxStrcat(buf, wxFileFunctionsBuffer);

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

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

 }
 
 /*-
 }
 
 /*-


@@ -436,24 +469,24 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
 {
     register wxChar *d, *s, *nm;
     wxChar          lnm[_MAXPATHLEN];
 {
     register wxChar *d, *s, *nm;
     wxChar          lnm[_MAXPATHLEN];

-    int                                q;
+    int             q;

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

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

 
     wxChar      trimchars[4];
 
     wxChar      trimchars[4];

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

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

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

 #else
 #else

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

 #endif
 #endif

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

         return buf;
     nm = copystring(name); // Make a scratch copy
     wxChar *nm_tmp = nm;
         return buf;
     nm = copystring(name); // Make a scratch copy
     wxChar *nm_tmp = nm;


@@ -464,14 +497,14 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     /* And strip off trailing whitespace and cr */
     s = nm + (q = wxStrlen(nm)) - 1;
     while (q-- && wxStrchr((wxChar *)trimchars, *s) != NULL)
     /* And strip off trailing whitespace and cr */
     s = nm + (q = wxStrlen(nm)) - 1;
     while (q-- && wxStrchr((wxChar *)trimchars, *s) != NULL)

-        *s = _T('\0');
+        *s = wxT('\0');

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

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

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


@@ -479,7 +512,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     while (*d)
     {
       *d++ = *s;
     while (*d)
     {
       *d++ = *s;

-      if(*s == _T('\\'))
+      if(*s == wxT('\\'))

       {
         *(d - 1) = *++s;
         if (*d)
       {
         *(d - 1) = *++s;
         if (*d)


@@ -492,9 +525,9 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
       }
       else
 #else
       }
       else
 #else

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

 #  ifndef __WXMSW__
 #  ifndef __WXMSW__

-        if (*s == _T('\\')) {
+        if (*s == wxT('\\')) {

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


@@ -504,34 +537,23 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
 #  endif
 #endif
 #ifdef __WXMSW__
 #  endif
 #endif
 #ifdef __WXMSW__

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

 #else
 #else

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

 #endif
         {
             register wxChar  *start = d;
 #endif
         {
             register wxChar  *start = d;

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

             register wxChar  *value;
             register wxChar  *value;

-#ifdef __VISAGECPP__
-    // VA gives assignment in logical expr warning
-            while (*d)
-               *d++ = *s;
-#else
-            while ((*d++ = *s))
-#endif
-                if (braces ? (*s == _T('}') || *s == _T(')')) : !(wxIsalnum(*s) || *s == _T('_')) )
+            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) {
                     break;
                 else
                     s++;
             *--d = 0;
             value = wxGetenv(braces ? start + 1 : start);
             if (value) {

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

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


@@ -541,14 +563,14 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
 
     /* Expand ~ and ~user */
     nm = lnm;
 
     /* Expand ~ and ~user */
     nm = lnm;

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

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

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

                 if (*++nm)
                     nm++;
             }
                 if (*++nm)
                     nm++;
             }


@@ -561,11 +583,11 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;
             *s = 0;
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;
             *s = 0;

-           // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+        // 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 ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) {
                if (was_sep) /* replace only if it was there: */
                    *s = SEP;

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

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


@@ -576,26 +598,19 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *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 (_T('\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;

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


@@ -608,7 +623,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
 {
   static wxChar dest[_MAXPATHLEN];
 
 {
   static wxChar dest[_MAXPATHLEN];
 

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

     return (wxChar *) NULL;
 
   wxStrcpy (dest, WXSTRINGCAST filename);
     return (wxChar *) NULL;
 
   wxStrcpy (dest, WXSTRINGCAST filename);


@@ -622,12 +637,12 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
   if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
      (tcp = wxStrstr (dest, val)) != NULL)
     {
   if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
      (tcp = wxStrstr (dest, val)) != NULL)
     {

-        wxStrcpy (wxBuffer, tcp + wxStrlen (val));
-        *tcp++ = _T('$');
-        *tcp++ = _T('{');
+        wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));
+        *tcp++ = wxT('$');
+        *tcp++ = wxT('{');

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

-        wxStrcat (tcp, _T("}"));
-        wxStrcat (tcp, wxBuffer);
+        wxStrcat (tcp, wxT("}"));
+        wxStrcat (tcp, wxFileFunctionsBuffer);

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


@@ -636,16 +651,16 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
       (len = wxStrlen(val)) > 2 &&
       wxStrncmp(dest, val, len) == 0)
     {
       (len = wxStrlen(val)) > 2 &&
       wxStrncmp(dest, val, len) == 0)
     {

-      wxStrcpy(wxBuffer, _T("~"));
-      if (user != _T(""))
-             wxStrcat(wxBuffer, (const wxChar*) 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

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

     }
 
   return dest;
     }
 
   return dest;


@@ -655,222 +670,335 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
 // (basename)
 wxChar *wxFileNameFromPath (wxChar *path)
 {
 // (basename)
 wxChar *wxFileNameFromPath (wxChar *path)
 {

-  if (path)
+    if (path)

     {
     {

-      register wxChar *tcp;
-
-      tcp = path + wxStrlen (path);
-      while (--tcp >= path)
+        register wxChar *tcp;
+        
+        tcp = path + wxStrlen (path);
+        while (--tcp >= path)

         {
         {

-          if (*tcp == _T('/') || *tcp == _T('\\')
-#ifdef __VMS__
-     || *tcp == _T(':') || *tcp == _T(']'))
+#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
+#ifdef __VMS__
+            if (*tcp == wxT(':') || *tcp == wxT(']'))
+                return tcp + 1;

 #endif
 #endif

-            return tcp + 1;
-        }                        /* while */
+        } /* while */

 #if defined(__WXMSW__) || defined(__WXPM__)
 #if defined(__WXMSW__) || defined(__WXPM__)

-      if (wxIsalpha (*path) && *(path + 1) == _T(':'))
-        return path + 2;
+        // 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 != _T(""))
-  {
-
-      wxChar *path = WXSTRINGCAST path1 ;
-      register wxChar *tcp;
-
-      tcp = path + wxStrlen (path);
-      while (--tcp >= path)
-          {
-            if (*tcp == _T('/') || *tcp == _T('\\')
-#ifdef __VMS__
-        || *tcp == _T(':') || *tcp == _T(']'))
+    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

+#ifdef __VMS__
+            if (*tcp == wxT(':') || *tcp == wxT(']'))

                 return wxString(tcp + 1);
                 return wxString(tcp + 1);

-            }                        /* while */
+#endif
+        } /* while */

 #if defined(__WXMSW__) || defined(__WXPM__)
 #if defined(__WXMSW__) || defined(__WXPM__)

-      if (wxIsalpha (*path) && *(path + 1) == _T(':'))
+        // MSDOS like
+        if (wxIsalpha (*path) && *(path + 1) == wxT(':'))

             return wxString(path + 2);
 #endif
     }
             return wxString(path + 2);
 #endif
     }

-  // Yes, this should return the path, not an empty string, otherwise
-  // we get "thing.txt" -> "".
-  return path1;
+    // 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
 wxChar *
 wxPathOnly (wxChar *path)
 {
 }
 
 // Return just the directory, or NULL if no directory
 wxChar *
 wxPathOnly (wxChar *path)
 {

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

     {
     {

-      static wxChar buf[_MAXPATHLEN];
-
-      // Local copy
-      wxStrcpy (buf, path);
-
-      int l = wxStrlen(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] == _T('/') || path[i] == _T('\\') || path[i] == _T(']'))
+        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 --;

         }
         }

-        else i --;
-      }
-
+        

 #if defined(__WXMSW__) || defined(__WXPM__)
 #if defined(__WXMSW__) || defined(__WXPM__)

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

         {
         {

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

         }
 #endif
     }
         }
 #endif
     }

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

 }
 
 // Return just the directory, or NULL if no directory
 wxString wxPathOnly (const wxString& path)
 {
 }
 
 // Return just the directory, or NULL if no directory
 wxString wxPathOnly (const wxString& path)
 {

-  if (path != _T(""))
+    if (path != wxT(""))

     {
     {

-      wxChar buf[_MAXPATHLEN];
-
-      // Local copy
-      wxStrcpy (buf, WXSTRINGCAST path);
-
-      int l = path.Length();
-      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] == _T('/') || path[i] == _T('\\') || path[i] == _T(']'))
+        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)

         {
         {

-          done = TRUE;
-#ifdef __VMS__
-          buf[i+1] = 0;
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+            // Classic or Carbon CodeWarrior like
+            // Carbon with Apple DevTools is Unix like
+            if (path[i] == wxT(':') )
+            {
+                buf[i] = 0;
+                return wxString(buf);
+            }

 #else
 #else

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

 #endif
 #endif

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

         }
         }

-        else i --;
-      }
-
+        

 #if defined(__WXMSW__) || defined(__WXPM__)
 #if defined(__WXMSW__) || defined(__WXPM__)

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

         {
         {

-          // A:junk --> A:. (since A:.\junk Not A:\junk)
-          buf[2] = _T('.');
-          buf[3] = _T('\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(_T(""));
+    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 (wxChar *s)
+#if defined(__WXMAC__)
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )

 {
 {

-        if (s)
-        {
-                memmove( s+1 , s ,(strlen( s ) + 1)*sizeof(wxChar)) ;
-                if ( *s == _T(':') )
-                        *s = _T('.') ;
-                else
-                        *s = _T('/') ;
+#ifdef __DARWIN__
+    FSRef theRef;
+    char  thePath[FILENAME_MAX];
+
+    // convert the FSSpec to an FSRef
+    (void) FSpMakeFSRef( spec, &theRef );
+    // get the POSIX path associated with the FSRef
+    (void) FSRefMakePath( &theRef, (UInt8 *)thePath, sizeof(thePath) );
+    
+    // create path string for return value
+    wxString result( thePath ) ;
+#else
+    Handle    myPath ;
+    short     length ;
+
+    // get length of path and allocate handle
+    FSpGetFullPath( spec , &length , &myPath ) ;
+    ::SetHandleSize( myPath , length + 1 ) ;
+    ::HLock( myPath ) ;
+    (*myPath)[length] = 0 ;
+    if ((length > 0) && ((*myPath)[length-1] == ':'))
+        (*myPath)[length-1] = 0 ;
+    
+    // create path string for return value
+    wxString result( (char*) *myPath ) ;
+
+    // free allocated handle
+    ::HUnlock( myPath ) ;
+    ::DisposeHandle( myPath ) ;
+#endif
+
+    return result ;
+}

 
 

-                while (*s)
-                {
-                        if (*s == _T(':'))
-                          *s = _T('/');
-                        else
-                          *s = wxTolower(*s);        // Case INDEPENDENT
-                        s++;
-                }
+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
+    FSpLocationFromFullPath( strlen(path) , path , spec ) ;
+#endif
+}
+
+#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++;

         }
         }

+    }
+    return wxString(sMacFileNameConversion) ;

 }
 
 }
 

-void
-wxUnix2MacFilename (wxChar *s)
+wxString wxUnix2MacFilename (const char *str)

 {
 {

-        if (s)
+    char *s = sMacFileNameConversion ;
+    strcpy( s , str ) ;
+    if (s)
+    {
+        if ( *s == '.' )

         {
         {

-                if ( *s == _T('.') )
-                {
-                        // relative path , since it goes on with slash which is translated to a :
-                        memmove( s , s+1 ,strlen( s )*sizeof(wxChar) ) ;
-                }
-                else if ( *s == _T('/') )
+            // 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) == '\\') ) )

                 {
                 {

-                        // absolute path -> on mac just start with the drive name
-                        memmove( s , s+1 ,strlen( s )*sizeof(wxChar) ) ;
+                    *s = ':';
+                    memmove( s+1 , s+3 ,strlen( s+3 ) + 1 ) ;

                 }
                 else
                 }
                 else

-                {
-                        wxASSERT_MSG( 1 , _T("unknown path beginning") ) ;
-                }
-                while (*s)
-                {
-                        if (*s == _T('/') || *s == _T('\\'))
-                                  *s = _T(':');
-
-                        s++ ;
-                }
+                    *s = ':';
+            }
+            s++ ;

         }
         }

+    }
+    return wxString (sMacFileNameConversion) ;

 }
 }

-#endif
+
+wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
+{
+    return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
+}
+
+void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
+{
+    wxString var = wxUnix2MacFilename( path ) ;
+    wxMacFilename2FSSpec( var , spec ) ;
+}
+#endif // ! __DARWIN__
+
+#endif // __WXMAC__
+

 void
 void

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

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

-        if (*s == _T('\\'))
-          *s = _T('/');
-#if defined(__WXMSW__) || defined(__WXPM__)
+        if (*s == '\\')
+          *s = '/';
+#ifdef __WXMSW__

         else
         else

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

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


@@ -880,7 +1008,7 @@ void
 #if defined(__WXMSW__) || defined(__WXPM__)
 wxUnix2DosFilename (wxChar *s)
 #else
 #if defined(__WXMSW__) || defined(__WXPM__)
 wxUnix2DosFilename (wxChar *s)
 #else

-wxUnix2DosFilename (wxChar *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


@@ -888,8 +1016,8 @@ wxUnix2DosFilename (wxChar *WXUNUSED(s))
   if (s)
     while (*s)
       {
   if (s)
     while (*s)
       {

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

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


@@ -899,28 +1027,17 @@ wxUnix2DosFilename (wxChar *WXUNUSED(s))
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {

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

 
   FILE *fp1 = (FILE *) NULL;
   FILE *fp2 = (FILE *) NULL;
   FILE *fp3 = (FILE *) NULL;
   // Open the inputs and outputs
 
   FILE *fp1 = (FILE *) NULL;
   FILE *fp2 = (FILE *) NULL;
   FILE *fp3 = (FILE *) NULL;
   // Open the inputs and outputs

-#ifdef __WXMAC__
-        wxStrcpy( gwxMacFileName , file1 ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-        wxStrcpy( gwxMacFileName2 , file2) ;
-        wxUnix2MacFilename( gwxMacFileName2 ) ;
-        wxStrcpy( gwxMacFileName3 , outfile) ;
-        wxUnix2MacFilename( gwxMacFileName3 ) ;
-
-  if ((fp1 = fopen (gwxMacFileName, "rb")) == NULL ||
-      (fp2 = fopen (gwxMacFileName2, "rb")) == NULL ||
-      (fp3 = fopen (gwxMacFileName3, "wb")) == NULL)
-#else
-  if ((fp1 = fopen (FNSTRINGCAST file1.fn_str(), "rb")) == NULL ||
-      (fp2 = fopen (FNSTRINGCAST file2.fn_str(), "rb")) == NULL ||
-      (fp3 = fopen (wxFNCONV(outfile), "wb")) == NULL)
-#endif
+  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)
         fclose (fp1);
     {
       if (fp1)
         fclose (fp1);


@@ -942,61 +1059,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
 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
+    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;

 
 

-#ifdef __WXMAC__
-        wxStrcpy( gwxMacFileName , file1 ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-        wxStrcpy( gwxMacFileName2 , file2) ;
-        wxUnix2MacFilename( gwxMacFileName2 ) ;
+    // get permissions of file1
+    if ( wxStat(OS_FILENAME(file1), &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;
+    }

 
 

-  if ((fd1 = fopen (gwxMacFileName, "rb")) == NULL)
-    return FALSE;
-  if ((fd2 = fopen (gwxMacFileName2, "wb")) == NULL)
-#else
-  if ((fd1 = fopen (FNSTRINGCAST file1.fn_str(), "rb")) == NULL)
-    return FALSE;
-  if ((fd2 = fopen (FNSTRINGCAST file2.fn_str(), "wb")) == NULL)
-#endif
+    // 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;
+    }
+
+#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;

 
 

-  fclose (fd1);
-  fclose (fd2);
-  return TRUE;
+#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
+
+    return TRUE;
+#endif // __WXMSW__ && __WIN32__

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

-#ifdef __WXMAC__
-        wxStrcpy( gwxMacFileName , file1 ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-        wxStrcpy( gwxMacFileName2 , file2) ;
-        wxUnix2MacFilename( gwxMacFileName2 ) ;
-
-  if (0 == rename (gwxMacFileName, gwxMacFileName2))
-    return TRUE;
-#else

   // Normal system call
   // Normal system call

-  if (0 == rename (FNSTRINGCAST file1.fn_str(), FNSTRINGCAST file2.fn_str()))
+  if ( wxRename (file1, file2) == 0 )

     return TRUE;
     return TRUE;

-#endif
+

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


@@ -1008,34 +1177,43 @@ wxRenameFile (const wxString& file1, const wxString& file2)
 
 bool wxRemoveFile(const wxString& file)
 {
 
 bool wxRemoveFile(const wxString& file)
 {

-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
-  int flag = remove(FNSTRINGCAST file.fn_str());
-#elif defined( __WXMAC__ )
-        wxStrcpy( gwxMacFileName , file ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-  int flag = unlink(gwxMacFileName);
+#if defined(__VISUALC__) \
+ || defined(__BORLANDC__) \
+ || defined(__WATCOMC__) \
+ || defined(__GNUWIN32__)
+  int res = wxRemove(file);

 #else
 #else

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

 #endif
 #endif

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

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

-#if defined( __WXMAC__ )
-    wxStrcpy( gwxMacFileName , dir ) ;
-    wxUnix2MacFilename( gwxMacFileName ) ;
-    const wxChar *dirname = gwxMacFileName;
+#if defined(__WXMAC__) && !defined(__UNIX__)
+  return (mkdir( dir , 0 ) == 0);

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

-#endif // Mac/!Mac

 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler
 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler

-#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__)
+#if (!(defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WXMICROWIN__)

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

-#else  // MSW and OS/2
-    if ( mkdir(FNSTRINGCAST wxFNCONV(dirname)) != 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);
 #endif // !MSW/MSW
     {
         wxLogSysError(_("Directory '%s' couldn't be created"), dirname);


@@ -1044,416 +1222,144 @@ bool wxMkdir(const wxString& dir, int perm)
     }
 
     return TRUE;
     }
 
     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__ )
-        wxStrcpy( gwxMacFileName , dir ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-  return (rmdir(WXSTRINGCAST gwxMacFileName) == 0);
+  return FALSE; //to be changed since rmdir exists in VMS7.x
+#elif defined(__WXPM__)
+  return (::DosDeleteDir((PSZ)dir.c_str()) == 0);

 #else
 
 #ifdef __SALFORDC__
   return FALSE; // What to do?
 #else
 #else
 
 #ifdef __SALFORDC__
   return FALSE; // What to do?
 #else

-  return (rmdir(FNSTRINGCAST dir.fn_str()) == 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.fn_str(), &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE;
-#else
-
-  /* MATTHEW: [6] Always use same code for Win32, call FindClose */
-#if defined(__WIN32__)
-  WIN32_FIND_DATA fileInfo;
-#else
-#ifdef __BORLANDC__
-  struct ffblk fileInfo;
-#else
-  struct find_t fileInfo;
-#endif
-#endif
+    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
-
-#endif
-}
-
-#endif

 
 

-// does the path exists? (may have or not '/' or '\\' at the end)
-bool wxPathExists(const wxChar *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] != _T('\0') )
-    strPath.Last() = _T('\0');
-
-#ifdef __SALFORDC__
-  struct _stat st;
+    wxStructStat st;
+#ifndef __VISAGECPP__
+    return wxStat(wxFNSTRINGCAST strPath.fn_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(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 &&
+        (st.st_mode == S_IFDIR);

 #endif
 
 #endif
 

-  return stat(FNSTRINGCAST strPath.fn_str(), &st) == 0 && (st.st_mode & S_IFDIR);
+#endif

 }
 
 // Get a temporary filename, opening and closing the file.
 wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
 {
 }
 
 // Get a temporary filename, opening and closing the file.
 wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
 {

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

 
 

-#ifndef        __WIN32__
-  wxChar tmp[144];
-  ::GetTempFileName(0, WXSTRINGCAST prefix, 0, tmp);
-#else
-  wxChar tmp[MAX_PATH];
-  wxChar tmpPath[MAX_PATH];
-  ::GetTempPath(MAX_PATH, tmpPath);
-  ::GetTempFileName(tmpPath, WXSTRINGCAST prefix, 0, tmp);
-#endif
-  if (buf) wxStrcpy(buf, tmp);
-  else buf = copystring(tmp);
-  return buf;
-
-#else
-  static short last_temp = 0;        // cache last to speed things a bit
-  // At most 1000 temp files to a process! We use a ring count.
-  wxChar tmp[100]; // FIXME static buffer
+    if ( buf )
+        wxStrcpy(buf, filename);
+    else
+        buf = copystring(filename);

 
 

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

 }
 
 }
 

-// 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 *gs_dirStream = (DIR *) NULL;
-    static wxString gs_strFileSpec;
-    static int gs_findFlags = 0;
-#endif
+static wxDir *gs_dir = NULL;
+static wxString gs_dirPath;

 
 wxString wxFindFirstFile(const wxChar *spec, int flags)
 {
 
 wxString wxFindFirstFile(const wxChar *spec, int flags)
 {

-    wxString result;
-
-#ifndef __VMS__
-    if (gs_dirStream)
-        closedir(gs_dirStream); // edz 941103: better housekeping
-
-    gs_findFlags = flags;
-
-    gs_strFileSpec = spec;
-
-    // Find path only so we can concatenate
-    // found file onto path
-    wxString path(wxPathOnly(gs_strFileSpec));
-
-    // special case: path is really "/"
-    if ( !path && gs_strFileSpec[0u] == _T('/') )
-        path = _T('/');
-    // path is empty => Local directory
-    if ( !path )
-        path = _T('.');
-
-    gs_dirStream = opendir(path.fn_str());
-    if ( !gs_dirStream )
+    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 in directory '%s'"),
-                      path.c_str());
+        wxLogSysError(_("Can not enumerate files '%s'"), spec);
+        return wxEmptyString;

     }
     }

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

     {
     {

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

     }
     }

-#endif // !VMS
-
-    return result;
-}
-
-wxString wxFindNextFile()
-{
+    

     wxString result;
     wxString result;

-
-#ifndef __VMS__
-    wxCHECK_MSG( gs_dirStream, result, _T("must call wxFindFirstFile first") );
-
-    // Find path only so we can concatenate
-    // found file onto path
-    wxString path(wxPathOnly(gs_strFileSpec));
-    wxString name(wxFileNameFromPath(gs_strFileSpec));
-
-    /* MATTHEW: special case: path is really "/" */
-    if ( !path && gs_strFileSpec[0u] == _T('/'))
-        path = _T('/');
-
-    // Do the reading
-    struct dirent *nextDir;
-    for ( nextDir = readdir(gs_dirStream);
-          nextDir != NULL;
-          nextDir = readdir(gs_dirStream) )
+    gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags);
+    if ( result.IsEmpty() )

     {
     {

-        if (wxMatchWild(name, nextDir->d_name))
-        {
-            result.Empty();
-            if ( !path.IsEmpty() )
-            {
-                result = path;
-                if ( path != _T('/') )
-                    result += _T('/');
-            }
-
-            result += nextDir->d_name;
-
-            // Only return "." and ".." when they match
-            bool isdir;
-            if ( (strcmp(nextDir->d_name, ".") == 0) ||
-                 (strcmp(nextDir->d_name, "..") == 0))
-            {
-                if ( (gs_findFlags & wxDIR) != 0 )
-                    isdir = TRUE;
-                else
-                    continue;
-            }
-            else
-                isdir = wxDirExists(result);
-
-            // and only return directories when flags & wxDIR
-            if ( !gs_findFlags ||
-                 ((gs_findFlags & wxDIR) && isdir) ||
-                 ((gs_findFlags & wxFILE) && !isdir) )
-            {
-                return result;
-            }
-        }
-    }
-
-    result.Empty(); // not found
-
-    closedir(gs_dirStream);
-    gs_dirStream = (DIR *) NULL;
-#endif // !VMS
-
-    return result;
-}
-
-#elif defined(__WXMSW__)
-
-#ifdef __WIN32__
-    static HANDLE gs_hFileStruct = INVALID_HANDLE_VALUE;
-    static WIN32_FIND_DATA gs_findDataStruct;
-#else // Win16
-    #ifdef __BORLANDC__
-        static struct ffblk gs_findDataStruct;
-    #else
-        static struct _find_t gs_findDataStruct;
-    #endif // Borland
-#endif // Win32/16
-
-static wxString gs_strFileSpec;
-static int gs_findFlags = 0;
-
-wxString wxFindFirstFile(const wxChar *spec, int flags)
-{
-    wxString result;
-
-    gs_strFileSpec = spec;
-    gs_findFlags = flags; /* MATTHEW: [5] Remember flags */
-
-    // Find path only so we can concatenate found file onto path
-    wxString path(wxPathOnly(gs_strFileSpec));
-    if ( !path.IsEmpty() )
-        result << path << _T('\\');
-
-#ifdef __WIN32__
-    if ( gs_hFileStruct != INVALID_HANDLE_VALUE )
-        FindClose(gs_hFileStruct);
-
-    gs_hFileStruct = ::FindFirstFile(WXSTRINGCAST spec, &gs_findDataStruct);
-
-    if ( gs_hFileStruct == INVALID_HANDLE_VALUE )
-    {
-        result.Empty();
-
+        wxDELETE(gs_dir);

         return result;
     }
 
         return result;
     }
 

-    bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
-
-    if (isdir && !(flags & wxDIR))
-        return wxFindNextFile();
-    else if (!isdir && flags && !(flags & wxFILE))
-        return wxFindNextFile();
-
-    result += gs_findDataStruct.cFileName;
-
-    return result;
-#else
-    int flag = _A_NORMAL;
-    if (flags & wxDIR) /* MATTHEW: [5] Use & */
-        flag = _A_SUBDIR;
-
-#ifdef __BORLANDC__
-    if (findfirst(WXSTRINGCAST spec, &gs_findDataStruct, flag) == 0)
-#else
-        if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
-#endif
-        {
-            /* MATTHEW: [5] Check directory flag */
-            char attrib;
-
-#ifdef __BORLANDC__
-            attrib = gs_findDataStruct.ff_attrib;
-#else
-            attrib = gs_findDataStruct.attrib;
-#endif
-
-            if (attrib & _A_SUBDIR) {
-                if (!(gs_findFlags & wxDIR))
-                    return wxFindNextFile();
-            } else if (gs_findFlags && !(gs_findFlags & wxFILE))
-                return wxFindNextFile();
-
-            result +=
-#ifdef __BORLANDC__
-                    gs_findDataStruct.ff_name
-#else
-                    gs_findDataStruct.name
-#endif
-                    ;
-        }
-#endif // __WIN32__
-
-    return result;
+    return gs_dirPath + result;

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

-    wxString result;
-
-    // Find path only so we can concatenate found file onto path
-    wxString path(wxPathOnly(gs_strFileSpec));
-
-try_again:
-
-#ifdef __WIN32__
-    if (gs_hFileStruct == INVALID_HANDLE_VALUE)
-        return result;
+    wxASSERT_MSG( gs_dir, wxT("You must call wxFindFirstFile before!") );

 
 

-    bool success = (FindNextFile(gs_hFileStruct, &gs_findDataStruct) != 0);
-    if (!success)
-    {
-        FindClose(gs_hFileStruct);
-        gs_hFileStruct = INVALID_HANDLE_VALUE;
-    }
-    else
+    wxString result;
+    gs_dir->GetNext(&result);
+    
+    if ( result.IsEmpty() )

     {
     {

-        bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
-
-        if (isdir && !(gs_findFlags & wxDIR))
-            goto try_again;
-        else if (!isdir && gs_findFlags && !(gs_findFlags & wxFILE))
-            goto try_again;
-
-        if ( !path.IsEmpty() )
-            result << path << _T('\\');
-        result << gs_findDataStruct.cFileName;
+        wxDELETE(gs_dir);
+        return result;

     }
     }

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

 }
 
 }
 

-#endif // Unix/Windows

 
 // Get current working directory.
 // If buf is NULL, allocates space using new, else
 
 // Get current working directory.
 // If buf is NULL, allocates space using new, else


@@ -1466,19 +1372,72 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
   char *cbuf = new char[sz+1];
 #ifdef _MSC_VER
   if (_getcwd(cbuf, sz) == NULL) {
   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
   if (getcwd(cbuf, sz) == NULL) {
 #endif
     delete [] cbuf;
 #else
   if (getcwd(cbuf, sz) == NULL) {
 #endif
     delete [] cbuf;

-#else
+#else // wxUnicode

 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {
 #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 ) ;
+
+        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
   if (getcwd(buf, sz) == NULL) {
 #endif
 #endif
 #else
   if (getcwd(buf, sz) == NULL) {
 #endif
 #endif

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

   }
 #if wxUSE_UNICODE
   else {
   }
 #if wxUSE_UNICODE
   else {


@@ -1502,8 +1461,10 @@ wxString wxGetCwd()
 
 bool wxSetWorkingDirectory(const wxString& d)
 {
 
 bool wxSetWorkingDirectory(const wxString& d)
 {

-#if defined( __UNIX__ ) || defined( __WXMAC__ ) || defined(__WXPM__)
-  return (chdir(FNSTRINGCAST d.fn_str()) == 0);
+#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__
 #elif defined(__WINDOWS__)
 
 #ifdef __WIN32__


@@ -1539,7 +1500,7 @@ bool wxSetWorkingDirectory(const wxString& d)
 // On non-Windows platform, probably just return the empty string.
 wxString wxGetOSDirectory()
 {
 // On non-Windows platform, probably just return the empty string.
 wxString wxGetOSDirectory()
 {

-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)

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


@@ -1560,39 +1521,43 @@ bool wxEndsWithPathSeparator(const wxChar *pszFileName)
 // find a file in a list of directories, returns false if not found
 bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
 {
 // 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,
-               _("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;
+    // 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;

 
 

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

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


@@ -1601,56 +1566,20 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
                              wxString *pstrExt)
 {
     // it can be empty, but it shouldn't be NULL
                              wxString *pstrExt)
 {
     // it can be empty, but it shouldn't be NULL

-    wxCHECK_RET( pszFileName, _T("NULL file name in wxSplitPath") );
-
-    const wxChar *pDot = wxStrrchr(pszFileName, wxFILE_SEP_EXT);
-
-#ifdef __WXMSW__
-    // under Windows we understand both separators
-    const wxChar *pSepUnix = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
-    const wxChar *pSepDos = wxStrrchr(pszFileName, wxFILE_SEP_PATH_DOS);
-    const wxChar *pLastSeparator = pSepUnix > pSepDos ? pSepUnix : pSepDos;
-#else // assume Unix
-    const wxChar *pLastSeparator = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
-
-    if ( pDot == pszFileName )
-    {
-        // under Unix files like .profile are treated in a special way
-        pDot = NULL;
-    }
-#endif // MSW/Unix
-
-    if ( pDot < pLastSeparator )
-    {
-        // the dot is part of the path, not the start of the extension
-        pDot = NULL;
-    }
+    wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );

 
 

-    if ( pstrPath )
-    {
-        if ( pLastSeparator )
-            *pstrPath = wxString(pszFileName, pLastSeparator - pszFileName);
-        else
-            pstrPath->Empty();
-    }
-
-    if ( pstrName )
-    {
-        const wxChar *start = pLastSeparator ? pLastSeparator + 1 : pszFileName;
-        const wxChar *end = pDot ? pDot : pszFileName + wxStrlen(pszFileName);
+    wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt);
+}

 
 

-        *pstrName = wxString(start, end - start);
-    }
+time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+{
+    wxStructStat buf;

 
 

-    if ( pstrExt )
-    {
-        if ( pDot )
-            *pstrExt = wxString(pDot + 1);
-        else
-            pstrExt->Empty();
-    }
+    wxStat(filename.fn_str(), &buf);
+    return buf.st_mtime;

 }
 
 }
 

+

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


@@ -1661,9 +1590,9 @@ bool wxIsWild( const wxString& pattern )
   wxChar *pat = WXSTRINGCAST(tmp);
     while (*pat) {
         switch (*pat++) {
   wxChar *pat = WXSTRINGCAST(tmp);
     while (*pat) {
         switch (*pat++) {

-        case _T('?'): case _T('*'): case _T('['): case _T('{'):
+        case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):

             return TRUE;
             return TRUE;

-        case _T('\\'):
+        case wxT('\\'):

             if (!*pat++)
                 return FALSE;
         }
             if (!*pat++)
                 return FALSE;
         }


@@ -1697,57 +1626,57 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
     wxChar *cp;
     bool done = FALSE, ret_code, ok;
     // Below is for vi fans
     wxChar *cp;
     bool done = FALSE, ret_code, ok;
     // Below is for vi fans

-    const wxChar OB = _T('{'), CB = _T('}');
+    const wxChar OB = wxT('{'), CB = wxT('}');

 
     // dot_special means '.' only matches '.'
 
     // dot_special means '.' only matches '.'

-    if (dot_special && *str == _T('.') && *pattern != *str)
+    if (dot_special && *str == wxT('.') && *pattern != *str)

         return FALSE;
 
         return FALSE;
 

-    while ((*pattern != _T('\0')) && (!done)
-    && (((*str==_T('\0'))&&((*pattern==OB)||(*pattern==_T('*'))))||(*str!=_T('\0')))) {
+    while ((*pattern != wxT('\0')) && (!done)
+    && (((*str==wxT('\0'))&&((*pattern==OB)||(*pattern==wxT('*'))))||(*str!=wxT('\0')))) {

         switch (*pattern) {
         switch (*pattern) {

-        case _T('\\'):
+        case wxT('\\'):

             pattern++;
             pattern++;

-            if (*pattern != _T('\0'))
+            if (*pattern != wxT('\0'))

                 pattern++;
             break;
                 pattern++;
             break;

-        case _T('*'):
+        case wxT('*'):

             pattern++;
             ret_code = FALSE;
             pattern++;
             ret_code = FALSE;

-            while ((*str!=_T('\0'))
-            && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
+            while ((*str!=wxT('\0'))
+            && ((ret_code=wxMatchWild(pattern, str++, FALSE)) == 0))

                 /*loop*/;
             if (ret_code) {
                 /*loop*/;
             if (ret_code) {

-                while (*str != _T('\0'))
+                while (*str != wxT('\0'))

                     str++;
                     str++;

-                while (*pattern != _T('\0'))
+                while (*pattern != wxT('\0'))

                     pattern++;
             }
             break;
                     pattern++;
             }
             break;

-        case _T('['):
+        case wxT('['):

             pattern++;
           repeat:
             pattern++;
           repeat:

-            if ((*pattern == _T('\0')) || (*pattern == _T(']'))) {
+            if ((*pattern == wxT('\0')) || (*pattern == wxT(']'))) {

                 done = TRUE;
                 break;
             }
                 done = TRUE;
                 break;
             }

-            if (*pattern == _T('\\')) {
+            if (*pattern == wxT('\\')) {

                 pattern++;
                 pattern++;

-                if (*pattern == _T('\0')) {
+                if (*pattern == wxT('\0')) {

                     done = TRUE;
                     break;
                 }
             }
                     done = TRUE;
                     break;
                 }
             }

-            if (*(pattern + 1) == _T('-')) {
+            if (*(pattern + 1) == wxT('-')) {

                 c = *pattern;
                 pattern += 2;
                 c = *pattern;
                 pattern += 2;

-                if (*pattern == _T(']')) {
+                if (*pattern == wxT(']')) {

                     done = TRUE;
                     break;
                 }
                     done = TRUE;
                     break;
                 }

-                if (*pattern == _T('\\')) {
+                if (*pattern == wxT('\\')) {

                     pattern++;
                     pattern++;

-                    if (*pattern == _T('\0')) {
+                    if (*pattern == wxT('\0')) {

                         done = TRUE;
                         break;
                     }
                         done = TRUE;
                         break;
                     }


@@ -1761,51 +1690,51 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
                 goto repeat;
             }
             pattern++;
                 goto repeat;
             }
             pattern++;

-            while ((*pattern != _T(']')) && (*pattern != _T('\0'))) {
-                if ((*pattern == _T('\\')) && (*(pattern + 1) != _T('\0')))
+            while ((*pattern != wxT(']')) && (*pattern != wxT('\0'))) {
+                if ((*pattern == wxT('\\')) && (*(pattern + 1) != wxT('\0')))

                     pattern++;
                 pattern++;
             }
                     pattern++;
                 pattern++;
             }

-            if (*pattern != _T('\0')) {
+            if (*pattern != wxT('\0')) {

                 pattern++, str++;
             }
             break;
                 pattern++, str++;
             }
             break;

-        case _T('?'):
+        case wxT('?'):

             pattern++;
             str++;
             break;
         case OB:
             pattern++;
             pattern++;
             str++;
             break;
         case OB:
             pattern++;

-            while ((*pattern != CB) && (*pattern != _T('\0'))) {
+            while ((*pattern != CB) && (*pattern != wxT('\0'))) {

                 cp = str;
                 ok = TRUE;
                 cp = str;
                 ok = TRUE;

-                while (ok && (*cp != _T('\0')) && (*pattern != _T('\0'))
-                &&  (*pattern != _T(',')) && (*pattern != CB)) {
-                    if (*pattern == _T('\\'))
+                while (ok && (*cp != wxT('\0')) && (*pattern != wxT('\0'))
+                &&  (*pattern != wxT(',')) && (*pattern != CB)) {
+                    if (*pattern == wxT('\\'))

                         pattern++;
                     ok = (*pattern++ == *cp++);
                 }
                         pattern++;
                     ok = (*pattern++ == *cp++);
                 }

-                if (*pattern == _T('\0')) {
+                if (*pattern == wxT('\0')) {

                     ok = FALSE;
                     done = TRUE;
                     break;
                 } else if (ok) {
                     str = cp;
                     ok = FALSE;
                     done = TRUE;
                     break;
                 } else if (ok) {
                     str = cp;

-                    while ((*pattern != CB) && (*pattern != _T('\0'))) {
-                        if (*++pattern == _T('\\')) {
+                    while ((*pattern != CB) && (*pattern != wxT('\0'))) {
+                        if (*++pattern == wxT('\\')) {

                             if (*++pattern == CB)
                                 pattern++;
                         }
                     }
                 } else {
                             if (*++pattern == CB)
                                 pattern++;
                         }
                     }
                 } else {

-                    while (*pattern!=CB && *pattern!=_T(',') && *pattern!=_T('\0')) {
-                        if (*++pattern == _T('\\')) {
-                            if (*++pattern == CB || *pattern == _T(','))
+                    while (*pattern!=CB && *pattern!=wxT(',') && *pattern!=wxT('\0')) {
+                        if (*++pattern == wxT('\\')) {
+                            if (*++pattern == CB || *pattern == wxT(','))

                                 pattern++;
                         }
                     }
                 }
                                 pattern++;
                         }
                     }
                 }

-                if (*pattern != _T('\0'))
+                if (*pattern != wxT('\0'))

                     pattern++;
             }
             break;
                     pattern++;
             }
             break;


@@ -1817,9 +1746,9 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
             }
         }
     }
             }
         }
     }

-    while (*pattern == _T('*'))
+    while (*pattern == wxT('*'))

         pattern++;
         pattern++;

-    return ((*str == _T('\0')) && (*pattern == _T('\0')));
+    return ((*str == wxT('\0')) && (*pattern == wxT('\0')));

 };
 
 #endif
 };
 
 #endif