X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68abfefc451b6c8a67e8fbd79e5009cf656bde34..2035e10e83324c6925d12725b842768f6e2b00a2:/src/common/filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 9d81cf5669..2a1694b0a7 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -9,6 +9,14 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
     #pragma implementation "filefn.h"
 #endif
@@ -26,7 +34,7 @@
 #endif
 
 #include "wx/utils.h"
-#include <wx/intl.h>
+#include "wx/intl.h"
 
 // there are just too many of those...
 #ifdef __VISUALC__
@@ -73,8 +81,6 @@
     #ifndef __TWIN32__
         #include <sys/unistd.h>
     #endif
-
-    #define stricmp strcasecmp
 #endif
 
 #ifdef __BORLANDC__ // Please someone tell me which version of Borland needs
@@ -100,19 +106,42 @@
     #include "windows.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
 #define _MAXPATHLEN 500
 
 extern wxChar *wxBuffer;
+
 #ifdef __WXMAC__
-    extern wxChar gwxMacFileName[] ;
-    extern wxChar gwxMacFileName2[] ;
-    extern wxChar gwxMacFileName3[] ;
+
+#include "morefile.h"
+#include "moreextr.h"
+#include "fullpath.h"
+#include "fspcompa.h"
 #endif
 
-#if !USE_SHARED_LIBRARIES
     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
 
+// ============================================================================
+// implementation
+// ============================================================================
+
 void wxPathList::Add (const wxString& path)
 {
     wxStringList::Add (WXSTRINGCAST path);
@@ -123,9 +152,9 @@ void wxPathList::AddEnvList (const wxString& envVariable)
 {
   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
-        _T(" :;");
+        wxT(" :;");
 #endif
 
   wxChar *val = wxGetenv (WXSTRINGCAST envVariable);
@@ -135,15 +164,20 @@ void wxPathList::AddEnvList (const wxString& envVariable)
       wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
 
       if (token)
-        {
+      {
           Add (copystring (token));
           while (token)
-            {
+          {
               if ((token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr)) != NULL)
-                Add (wxString(token));
-            }
-        }
-      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 +215,11 @@ bool wxPathList::Member (const wxString& path)
 
 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];
-  wxStrcpy(buf, wxBuffer);
+  wxStrcpy(buf, wxFileFunctionsBuffer);
 
   wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
   filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
@@ -193,48 +227,39 @@ wxString wxPathList::FindValidPath (const wxString& file)
   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__
-      Unix2DosFilename (wxBuffer);
+      Unix2DosFilename (wxFileFunctionsBuffer);
 #endif
-      if (wxFileExists (wxBuffer))
+      if (wxFileExists (wxFileFunctionsBuffer))
       {
-        return wxString(wxBuffer);        // Found!
+        return wxString(wxFileFunctionsBuffer);        // Found!
       }
     }                                // for()
 
-  return wxString(_T(""));                    // Not found
+  return wxString(wxT(""));                    // Not found
 }
 
 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
@@ -247,10 +272,8 @@ wxFileExists (const wxString& filename)
     return TRUE;
 #elif defined(__WXMAC__)
           struct stat stbuf;
-        wxStrcpy( gwxMacFileName , filename ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-          if (gwxMacFileName && stat (WXSTRINGCAST gwxMacFileName, &stbuf) == 0)
-            return TRUE;
+        if (filename && stat (wxUnix2MacFilename(filename), &stbuf) == 0 )
+          return TRUE;
     return FALSE ;
 #else
 
@@ -260,7 +283,7 @@ wxFileExists (const wxString& filename)
   struct stat stbuf;
 #endif
 
-  if ((filename != _T("")) && stat (FNSTRINGCAST filename.fn_str(), &stbuf) == 0)
+  if ((filename != wxT("")) && stat (wxFNSTRINGCAST filename.fn_str(), &stbuf) == 0)
     return TRUE;
   return FALSE;
 #endif
@@ -281,15 +304,15 @@ bool wxFileExists(const char *pszFileName)
 bool
 wxIsAbsolutePath (const wxString& filename)
 {
-  if (filename != _T(""))
+  if (filename != wxT(""))
     {
-      if (filename[0] == _T('/')
+      if (filename[0] == wxT('/')
 #ifdef __VMS__
-      || (filename[0] == _T('[') && filename[1] != _T('.'))
+      || (filename[0] == wxT('[') && filename[1] != wxT('.'))
 #endif
 #ifdef __WINDOWS__
       /* MSDOS */
-      || filename[0] == _T('\\') || (wxIsalpha (filename[0]) && filename[1] == _T(':'))
+      || filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':'))
 #endif
         )
         return TRUE;
@@ -309,7 +332,7 @@ void wxStripExtension(wxChar *buffer)
   int i = len-1;
   while (i > 0)
   {
-    if (buffer[i] == _T('.'))
+    if (buffer[i] == wxT('.'))
     {
       buffer[i] = 0;
       break;
@@ -324,7 +347,7 @@ void wxStripExtension(wxString& buffer)
   size_t i = len-1;
   while (i > 0)
   {
-    if (buffer.GetChar(i) == _T('.'))
+    if (buffer.GetChar(i) == wxT('.'))
     {
       buffer = buffer.Left(i);
       break;
@@ -337,15 +360,15 @@ void wxStripExtension(wxString& buffer)
 wxChar *wxRealPath (wxChar *path)
 {
 #ifdef __WXMSW__
-  static const wxChar SEP = _T('\\');
+  static const wxChar SEP = wxT('\\');
   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;
-    if (path[2] == SEP && path[1] == _T('.'))
+    if (path[2] == SEP && path[1] == wxT('.'))
       p = &path[0];
     else
       p = &path[2];
@@ -353,31 +376,31 @@ wxChar *wxRealPath (wxChar *path)
       {
         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--);
-                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);
-                    if (path[0] == _T('\0'))
+                    if (path[0] == wxT('\0'))
                       {
                         path[0] = SEP;
-                        path[1] = _T('\0');
+                        path[1] = wxT('\0');
                       }
 #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[3] = _T('\0');
+                        path[3] = wxT('\0');
                       }
 #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);
           }
       }
@@ -388,25 +411,25 @@ wxChar *wxRealPath (wxChar *path)
 // Must be destroyed
 wxChar *wxCopyAbsolutePath(const wxString& filename)
 {
-  if (filename == _T(""))
+  if (filename == wxT(""))
     return (wxChar *) NULL;
 
-  if (! IsAbsolutePath(wxExpandPath(wxBuffer, filename))) {
+  if (! IsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
     wxChar  buf[_MAXPATHLEN];
-    buf[0] = _T('\0');
+    buf[0] = wxT('\0');
     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
-    if (ch != _T('/'))
-        wxStrcat(buf, _T("/"));
+    if (ch != wxT('/'))
+        wxStrcat(buf, wxT("/"));
 #endif
-    wxStrcat(buf, wxBuffer);
+    wxStrcat(buf, wxFileFunctionsBuffer);
     return copystring( wxRealPath(buf) );
   }
-  return copystring( wxBuffer );
+  return copystring( wxFileFunctionsBuffer );
 }
 
 /*-
@@ -439,21 +462,21 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     int                                q;
 
     // Some compilers don't like this line.
-//    const wxChar    trimchars[] = _T("\n \t");
+//    const wxChar    trimchars[] = wxT("\n \t");
 
     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__
-     const wxChar     SEP = _T('\\');
+     const wxChar     SEP = wxT('\\');
 #else
-     const wxChar     SEP = _T('/');
+     const wxChar     SEP = wxT('/');
 #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;
@@ -464,14 +487,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)
-        *s = _T('\0');
+        *s = wxT('\0');
 
     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 */
@@ -479,7 +502,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     while (*d)
     {
       *d++ = *s;
-      if(*s == _T('\\'))
+      if(*s == wxT('\\'))
       {
         *(d - 1) = *++s;
         if (*d)
@@ -494,7 +517,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
 #else
     while ((*d++ = *s)) {
 #  ifndef __WXMSW__
-        if (*s == _T('\\')) {
+        if (*s == wxT('\\')) {
             if ((*(d - 1) = *++s)) {
                 s++;
                 continue;
@@ -504,13 +527,13 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
 #  endif
 #endif
 #ifdef __WXMSW__
-        if (*s++ == _T('$') && (*s == _T('{') || *s == _T(')')))
+        if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
 #else
-        if (*s++ == _T('$'))
+        if (*s++ == wxT('$'))
 #endif
         {
             register wxChar  *start = d;
-            register int     braces = (*s == _T('{') || *s == _T('('));
+            register int     braces = (*s == wxT('{') || *s == wxT('('));
             register wxChar  *value;
 #ifdef __VISAGECPP__
     // VA gives assignment in logical expr warning
@@ -519,7 +542,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
 #else
             while ((*d++ = *s))
 #endif
-                if (braces ? (*s == _T('}') || *s == _T(')')) : !(wxIsalnum(*s) || *s == _T('_')) )
+                if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
                     break;
                 else
                     s++;
@@ -541,14 +564,14 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
 
     /* 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 */
 	    // FIXME: wxGetUserHome could return temporary storage in Unicode mode
-            if ((s = WXSTRINGCAST wxGetUserHome(_T(""))) != NULL) {
+            if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) {
                 if (*++nm)
                     nm++;
             }
@@ -565,7 +588,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) {
                if (was_sep) /* replace only if it was there: */
                    *s = SEP;
-                s = _T("");
+                s = wxT("");
             } else {
                 nm = nnm;
                 s = home;
@@ -576,7 +599,7 @@ 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 */
-        while (_T('\0') != (*d++ = *s++))
+        while (wxT('\0') != (*d++ = *s++))
           /* loop */;
         // Handle root home
         if (d - 1 > buf && *(d - 2) != SEP)
@@ -595,7 +618,6 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     return wxRealPath(buf);
 }
 
-
 /* Contract Paths to be build upon an environment variable
    component:
 
@@ -608,7 +630,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
 {
   static wxChar dest[_MAXPATHLEN];
 
-  if (filename == _T(""))
+  if (filename == wxT(""))
     return (wxChar *) NULL;
 
   wxStrcpy (dest, WXSTRINGCAST filename);
@@ -622,12 +644,12 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
   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);
-        wxStrcat (tcp, _T("}"));
-        wxStrcat (tcp, wxBuffer);
+        wxStrcat (tcp, wxT("}"));
+        wxStrcat (tcp, wxFileFunctionsBuffer);
     }
 
   // Handle User's home (ignore root homes!)
@@ -636,16 +658,16 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
       (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__
-//      strcat(wxBuffer, "\\");
+//      strcat(wxFileFunctionsBuffer, "\\");
 #else
-//      strcat(wxBuffer, "/");
+//      strcat(wxFileFunctionsBuffer, "/");
 #endif
-      wxStrcat(wxBuffer, dest + len);
-      wxStrcpy (dest, wxBuffer);
+      wxStrcat(wxFileFunctionsBuffer, dest + len);
+      wxStrcpy (dest, wxFileFunctionsBuffer);
     }
 
   return dest;
@@ -662,16 +684,16 @@ wxChar *wxFileNameFromPath (wxChar *path)
       tcp = path + wxStrlen (path);
       while (--tcp >= path)
         {
-          if (*tcp == _T('/') || *tcp == _T('\\')
+          if (*tcp == wxT('/') || *tcp == wxT('\\')
 #ifdef __VMS__
-     || *tcp == _T(':') || *tcp == _T(']'))
+     || *tcp == wxT(':') || *tcp == wxT(']'))
 #else
      )
 #endif
             return tcp + 1;
         }                        /* while */
 #if defined(__WXMSW__) || defined(__WXPM__)
-      if (wxIsalpha (*path) && *(path + 1) == _T(':'))
+      if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
         return path + 2;
 #endif
     }
@@ -680,7 +702,7 @@ wxChar *wxFileNameFromPath (wxChar *path)
 
 wxString wxFileNameFromPath (const wxString& path1)
 {
-  if (path1 != _T(""))
+  if (path1 != wxT(""))
   {
 
       wxChar *path = WXSTRINGCAST path1 ;
@@ -689,16 +711,16 @@ wxString wxFileNameFromPath (const wxString& path1)
       tcp = path + wxStrlen (path);
       while (--tcp >= path)
           {
-            if (*tcp == _T('/') || *tcp == _T('\\')
+            if (*tcp == wxT('/') || *tcp == wxT('\\')
 #ifdef __VMS__
-        || *tcp == _T(':') || *tcp == _T(']'))
+        || *tcp == wxT(':') || *tcp == wxT(']'))
 #else
         )
 #endif
                 return wxString(tcp + 1);
             }                        /* while */
 #if defined(__WXMSW__) || defined(__WXPM__)
-      if (wxIsalpha (*path) && *(path + 1) == _T(':'))
+      if (wxIsalpha (*path) && *(path + 1) == wxT(':'))
             return wxString(path + 2);
 #endif
     }
@@ -727,7 +749,7 @@ wxPathOnly (wxChar *path)
       while (!done && i > -1)
       {
         // ] is for VMS
-        if (path[i] == _T('/') || path[i] == _T('\\') || path[i] == _T(']'))
+        if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
         {
           done = TRUE;
 #ifdef __VMS__
@@ -743,11 +765,11 @@ wxPathOnly (wxChar *path)
 
 #if defined(__WXMSW__) || defined(__WXPM__)
       // Try Drive specifier
-      if (wxIsalpha (buf[0]) && buf[1] == _T(':'))
+      if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
         {
           // A:junk --> A:. (since A:.\junk Not A:\junk)
-          buf[2] = _T('.');
-          buf[3] = _T('\0');
+          buf[2] = wxT('.');
+          buf[3] = wxT('\0');
           return buf;
         }
 #endif
@@ -759,7 +781,7 @@ wxPathOnly (wxChar *path)
 // Return just the directory, or NULL if no directory
 wxString wxPathOnly (const wxString& path)
 {
-  if (path != _T(""))
+  if (path != wxT(""))
     {
       wxChar buf[_MAXPATHLEN];
 
@@ -775,7 +797,7 @@ wxString wxPathOnly (const wxString& path)
       while (!done && i > -1)
       {
         // ] is for VMS
-        if (path[i] == _T('/') || path[i] == _T('\\') || path[i] == _T(']'))
+        if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
         {
           done = TRUE;
 #ifdef __VMS__
@@ -791,17 +813,17 @@ wxString wxPathOnly (const wxString& path)
 
 #if defined(__WXMSW__) || defined(__WXPM__)
       // Try Drive specifier
-      if (wxIsalpha (buf[0]) && buf[1] == _T(':'))
+      if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
         {
           // A:junk --> A:. (since A:.\junk Not A:\junk)
-          buf[2] = _T('.');
-          buf[3] = _T('\0');
+          buf[2] = wxT('.');
+          buf[3] = wxT('\0');
           return wxString(buf);
         }
 #endif
     }
 
-  return wxString(_T(""));
+  return wxString(wxT(""));
 }
 
 // Utility for converting delimiters in DOS filenames to UNIX style
@@ -809,68 +831,119 @@ wxString wxPathOnly (const wxString& path)
 // Also, convert to lower case, since case is significant in UNIX.
 
 #ifdef __WXMAC__
-void
-wxMac2UnixFilename (wxChar *s)
+
+static char sMacFileNameConversion[ 1000 ] ;
+
+wxString wxMac2UnixFilename (const char *str)
 {
-        if (s)
-        {
-                memmove( s+1 , s ,(strlen( s ) + 1)*sizeof(wxChar)) ;
-                if ( *s == _T(':') )
-                        *s = _T('.') ;
-                else
-                        *s = _T('/') ;
-
-                while (*s)
-                {
-                        if (*s == _T(':'))
-                          *s = _T('/');
-                        else
-                          *s = wxTolower(*s);        // Case INDEPENDENT
-                        s++;
-                }
-        }
+	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)
-        {
-                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('/') )
-                {
-                        // absolute path -> on mac just start with the drive name
-                        memmove( s , s+1 ,strlen( s )*sizeof(wxChar) ) ;
-                }
-                else
-                {
-                        wxASSERT_MSG( 1 , _T("unknown path beginning") ) ;
-                }
-                while (*s)
-                {
-                        if (*s == _T('/') || *s == _T('\\'))
-                                  *s = _T(':');
+	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++ ;
-                }
-        }
+      s++ ;
+    }
+  }
+  return wxString (sMacFileNameConversion) ;
+}
+
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
+{
+	Handle	myPath ;
+	short 	length ;
+	
+	FSpGetFullPath( spec , &length , &myPath ) ;
+	::SetHandleSize( myPath , length + 1 ) ;
+	::HLock( myPath ) ;
+	(*myPath)[length] = 0 ;
+	if ( length > 0 && (*myPath)[length-1] ==':' )
+		(*myPath)[length-1] = 0 ;
+	
+	wxString result( 	(char*) *myPath ) ;
+	::HUnlock( myPath ) ;
+	::DisposeHandle( myPath ) ;
+	return result ;
+}
+
+wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
+{
+	return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
 }
+
+void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
+{
+	FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
+}
+
+void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
+{
+	wxString var = wxUnix2MacFilename( path ) ;
+	wxMacFilename2FSSpec( var , spec ) ;
+}
+
 #endif
 void
-wxDos2UnixFilename (wxChar *s)
+wxDos2UnixFilename (char *s)
 {
   if (s)
     while (*s)
       {
-        if (*s == _T('\\'))
-          *s = _T('/');
-#if defined(__WXMSW__) || defined(__WXPM__)
+        if (*s == '\\')
+          *s = '/';
+#ifdef __WXMSW__
         else
-          *s = wxTolower(*s);        // Case INDEPENDENT
+          *s = wxTolower (*s);        // Case INDEPENDENT
 #endif
         s++;
       }
@@ -880,7 +953,7 @@ void
 #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
@@ -888,8 +961,8 @@ wxUnix2DosFilename (wxChar *WXUNUSED(s))
   if (s)
     while (*s)
       {
-        if (*s == _T('/'))
-          *s = _T('\\');
+        if (*s == wxT('/'))
+          *s = wxT('\\');
         s++;
       }
 #endif
@@ -906,20 +979,13 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
   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)
+  if ((fp1 = fopen (wxUnix2MacFilename( file1 ), "rb")) == NULL ||
+      (fp2 = fopen (wxUnix2MacFilename( file2 ), "rb")) == NULL ||
+      (fp3 = fopen (wxUnix2MacFilename( outfile ), "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)
+  if ((fp1 = wxFopen (WXSTRINGCAST file1, wxT("rb"))) == NULL ||
+      (fp2 = wxFopen (WXSTRINGCAST file2, wxT("rb"))) == NULL ||
+      (fp3 = wxFopen (outfile, wxT("wb"))) == NULL)
 #endif
     {
       if (fp1)
@@ -955,18 +1021,13 @@ wxCopyFile (const wxString& file1, const wxString& file2)
   int ch;
 
 #ifdef __WXMAC__
-        wxStrcpy( gwxMacFileName , file1 ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-        wxStrcpy( gwxMacFileName2 , file2) ;
-        wxUnix2MacFilename( gwxMacFileName2 ) ;
-
-  if ((fd1 = fopen (gwxMacFileName, "rb")) == NULL)
+  if ((fd1 = fopen (wxUnix2MacFilename( file1 ), "rb")) == NULL)
     return FALSE;
-  if ((fd2 = fopen (gwxMacFileName2, "wb")) == NULL)
+  if ((fd2 = fopen (wxUnix2MacFilename( file2 ), "wb")) == NULL)
 #else
-  if ((fd1 = fopen (FNSTRINGCAST file1.fn_str(), "rb")) == NULL)
+  if ((fd1 = wxFopen (WXSTRINGCAST file1, wxT("rb"))) == NULL)
     return FALSE;
-  if ((fd2 = fopen (FNSTRINGCAST file2.fn_str(), "wb")) == NULL)
+  if ((fd2 = wxFopen (WXSTRINGCAST file2, wxT("wb"))) == NULL)
 #endif
     {
       fclose (fd1);
@@ -985,16 +1046,11 @@ 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))
+  if (0 == rename (wxUnix2MacFilename( file1 ), wxUnix2MacFilename( file2 )))
     return TRUE;
 #else
   // Normal system call
-  if (0 == rename (FNSTRINGCAST file1.fn_str(), FNSTRINGCAST file2.fn_str()))
+  if (0 == rename (wxFNSTRINGCAST file1.fn_str(), wxFNSTRINGCAST file2.fn_str()))
     return TRUE;
 #endif
   // Try to copy
@@ -1009,13 +1065,11 @@ wxRenameFile (const wxString& file1, const wxString& file2)
 bool wxRemoveFile(const wxString& file)
 {
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
-  int flag = remove(FNSTRINGCAST file.fn_str());
+  int flag = remove(wxFNSTRINGCAST file.fn_str());
 #elif defined( __WXMAC__ )
-        wxStrcpy( gwxMacFileName , file ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-  int flag = unlink(gwxMacFileName);
+  int flag = unlink(wxUnix2MacFilename( file ));
 #else
-  int flag = unlink(FNSTRINGCAST file.fn_str());
+  int flag = unlink(wxFNSTRINGCAST file.fn_str());
 #endif
   return (flag == 0) ;
 }
@@ -1023,19 +1077,16 @@ bool wxRemoveFile(const wxString& file)
 bool wxMkdir(const wxString& dir, int perm)
 {
 #if defined( __WXMAC__ )
-    wxStrcpy( gwxMacFileName , dir ) ;
-    wxUnix2MacFilename( gwxMacFileName ) ;
-    const wxChar *dirname = gwxMacFileName;
+  return (mkdir(wxUnix2MacFilename( dir ) , 0 ) == 0);
 #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
-#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__)
+#if (!(defined(__WXMSW__) || defined(__OS2__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__)
     if ( mkdir(wxFNCONV(dirname), perm) != 0 )
-#else  // MSW and OS/2
-    if ( mkdir((const char*)wxFNCONV(dirname)) != 0 )
+#else  // !MSW and !OS/2 VAC++
+    if ( mkdir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
 #endif // !MSW/MSW
     {
         wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
@@ -1044,22 +1095,21 @@ bool wxMkdir(const wxString& dir, int perm)
     }
 
     return TRUE;
+#endif // Mac/!Mac
 }
 
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #ifdef __VMS__
-  return FALSE;
+  return FALSE; //to be changed since rmdir exists in VMS7.x
 #elif defined( __WXMAC__ )
-        wxStrcpy( gwxMacFileName , dir ) ;
-        wxUnix2MacFilename( gwxMacFileName ) ;
-  return (rmdir(WXSTRINGCAST gwxMacFileName) == 0);
+  return (rmdir(wxUnix2MacFilename( dir )) == 0);
 #else
 
 #ifdef __SALFORDC__
   return FALSE; // What to do?
 #else
-  return (rmdir(FNSTRINGCAST dir.fn_str()) == 0);
+  return (rmdir(wxFNSTRINGCAST dir.fn_str()) == 0);
 #endif
 
 #endif
@@ -1069,7 +1119,7 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 bool wxDirExists(const wxString& dir)
 {
 #ifdef __VMS__
-  return FALSE;
+  return FALSE; //To be changed since stat exists in VMS7.x
 #elif !defined(__WXMSW__)
   struct stat sbuf;
   return (stat(dir.fn_str(), &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE;
@@ -1117,8 +1167,8 @@ 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');
+  if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != wxT('\0') )
+    strPath.Last() = wxT('\0');
 
 #ifdef __SALFORDC__
   struct _stat st;
@@ -1126,7 +1176,7 @@ bool wxPathExists(const wxChar *pszPathName)
   struct stat st;
 #endif
 
-  return stat(FNSTRINGCAST strPath.fn_str(), &st) == 0 && (st.st_mode & S_IFDIR);
+  return stat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && (st.st_mode & S_IFDIR);
 }
 
 // Get a temporary filename, opening and closing the file.
@@ -1154,7 +1204,7 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
 
   for (short suffix = last_temp + 1; suffix != last_temp; ++suffix %= 1000)
     {
-      wxSprintf (tmp, _T("/tmp/%s%d.%03x"), WXSTRINGCAST prefix, (int) getpid (), (int) suffix);
+      wxSprintf (tmp, wxT("/tmp/%s%d.%03x"), WXSTRINGCAST prefix, (int) getpid (), (int) suffix);
       if (!wxFileExists( tmp ))
         {
           // Touch the file to create it (reserve name)
@@ -1175,6 +1225,18 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
 #endif
 }
 
+bool wxGetTempFileName(const wxString& prefix, wxString& buf)
+{
+    wxChar buf2[512];
+    if (wxGetTempFileName(prefix, buf2) != (wxChar*) NULL)
+    {
+        buf = buf2;
+        return TRUE;
+    }
+    else
+        return FALSE;
+}
+
 // Get first file name matching given wild card.
 
 #ifdef __UNIX__
@@ -1182,7 +1244,7 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
 // Get first file name matching given wild card.
 // Flags are reserved for future use.
 
-#ifndef __VMS__
+#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
     static DIR *gs_dirStream = (DIR *) NULL;
     static wxString gs_strFileSpec;
     static int gs_findFlags = 0;
@@ -1192,7 +1254,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
 {
     wxString result;
 
-#ifndef __VMS__
+#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
     if (gs_dirStream)
         closedir(gs_dirStream); // edz 941103: better housekeping
 
@@ -1205,11 +1267,11 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     wxString path(wxPathOnly(gs_strFileSpec));
 
     // special case: path is really "/"
-    if ( !path && gs_strFileSpec[0u] == _T('/') )
-        path = _T('/');
+    if ( !path && gs_strFileSpec[0u] == wxT('/') )
+        path = wxT('/');
     // path is empty => Local directory
     if ( !path )
-        path = _T('.');
+        path = wxT('.');
 
     gs_dirStream = opendir(path.fn_str());
     if ( !gs_dirStream )
@@ -1221,7 +1283,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     {
         result = wxFindNextFile();
     }
-#endif // !VMS
+#endif // !VMS6.x or earlier
 
     return result;
 }
@@ -1230,8 +1292,8 @@ wxString wxFindNextFile()
 {
     wxString result;
 
-#ifndef __VMS__
-    wxCHECK_MSG( gs_dirStream, result, _T("must call wxFindFirstFile first") );
+#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
+    wxCHECK_MSG( gs_dirStream, result, wxT("must call wxFindFirstFile first") );
 
     // Find path only so we can concatenate
     // found file onto path
@@ -1239,8 +1301,8 @@ wxString wxFindNextFile()
     wxString name(wxFileNameFromPath(gs_strFileSpec));
 
     /* MATTHEW: special case: path is really "/" */
-    if ( !path && gs_strFileSpec[0u] == _T('/'))
-        path = _T('/');
+    if ( !path && gs_strFileSpec[0u] == wxT('/'))
+        path = wxT('/');
 
     // Do the reading
     struct dirent *nextDir;
@@ -1248,14 +1310,16 @@ wxString wxFindNextFile()
           nextDir != NULL;
           nextDir = readdir(gs_dirStream) )
     {
-        if (wxMatchWild(name, nextDir->d_name))
+        if (wxMatchWild(name, nextDir->d_name, FALSE) &&   // RR: added FALSE to find hidden files
+	    strcmp(nextDir->d_name, ".") &&
+	    strcmp(nextDir->d_name, "..") )
         {
             result.Empty();
             if ( !path.IsEmpty() )
             {
                 result = path;
-                if ( path != _T('/') )
-                    result += _T('/');
+                if ( path != wxT('/') )
+                    result += wxT('/');
             }
 
             result += nextDir->d_name;
@@ -1287,11 +1351,89 @@ wxString wxFindNextFile()
 
     closedir(gs_dirStream);
     gs_dirStream = (DIR *) NULL;
-#endif // !VMS
+#endif // !VMS6.2 or earlier
 
     return result;
 }
 
+#elif defined(__WXMAC__)
+
+struct MacDirectoryIterator
+{
+	CInfoPBRec			m_CPB ;
+	wxInt16				m_index ;
+	long				m_dirId ;
+	Str255				m_name ;
+} ;
+
+static int g_iter_flags ;
+
+static MacDirectoryIterator g_iter ;
+
+wxString wxFindFirstFile(const wxChar *spec, int flags)
+{
+    wxString result;
+
+    g_iter_flags = flags; /* MATTHEW: [5] Remember flags */
+
+    // Find path only so we can concatenate found file onto path
+    wxString path(wxPathOnly(spec));
+    if ( !path.IsEmpty() )
+        result << path << wxT('\\');
+
+	FSSpec fsspec ;
+
+	wxUnixFilename2FSSpec( result , &fsspec ) ;
+	g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
+	g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ;
+	g_iter.m_index = 0 ;
+	
+	Boolean isDir ;
+	FSpGetDirectoryID( &fsspec , &g_iter.m_dirId , &isDir ) ;
+	if ( !isDir )
+		return wxEmptyString ;
+		
+	return wxFindNextFile( ) ;
+}
+
+wxString wxFindNextFile()
+{
+    wxString result;
+
+	short err = noErr ;
+	
+	while ( err == noErr )
+	{
+		g_iter.m_index++ ;
+		g_iter.m_CPB.dirInfo.ioFDirIndex = g_iter.m_index;
+		g_iter.m_CPB.dirInfo.ioDrDirID = g_iter.m_dirId;	/* we need to do this every time */
+		err = PBGetCatInfoSync((CInfoPBPtr)&g_iter.m_CPB);
+		if ( err != noErr )
+			break ;
+			
+		if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (g_iter_flags & wxDIR) ) //  we have a directory
+			break ;
+			
+		if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) )
+			continue ;
+			
+		// hit !
+		break ;
+	}
+	if ( err != noErr )
+	{
+		return wxEmptyString ;
+	}
+	FSSpec spec ;
+	
+	FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum,
+								   g_iter.m_dirId,
+								   g_iter.m_name,
+								   &spec) ;
+								
+	return wxMacFSSpec2UnixFilename( &spec ) ;
+}
+
 #elif defined(__WXMSW__)
 
 #ifdef __WIN32__
@@ -1318,7 +1460,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     // Find path only so we can concatenate found file onto path
     wxString path(wxPathOnly(gs_strFileSpec));
     if ( !path.IsEmpty() )
-        result << path << _T('\\');
+        result << path << wxT('\\');
 
 #ifdef __WIN32__
     if ( gs_hFileStruct != INVALID_HANDLE_VALUE )
@@ -1382,6 +1524,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     return result;
 }
 
+
 wxString wxFindNextFile()
 {
     wxString result;
@@ -1411,7 +1554,7 @@ try_again:
             goto try_again;
 
         if ( !path.IsEmpty() )
-            result << path << _T('\\');
+            result << path << wxT('\\');
         result << gs_findDataStruct.cFileName;
     }
 
@@ -1453,7 +1596,51 @@ try_again:
     return result;
 }
 
-#endif // Unix/Windows
+#elif defined(__WXPM__)
+
+wxString wxFindFirstFile(const wxChar *spec, int flags)
+{
+    wxString result;
+
+    /*
+    // TODO: figure something out here for OS/2
+    gs_strFileSpec = spec;
+    gs_findFlags = flags;
+
+    // Find path only so we can concatenate found file onto path
+    wxString path(wxPathOnly(gs_strFileSpec));
+    if ( !path.IsEmpty() )
+        result << path << wxT('\\');
+
+    int flag = _A_NORMAL;
+    if (flags & wxDIR)
+        flag = _A_SUBDIR;
+
+    if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
+    {
+        char attrib;
+        attrib = gs_findDataStruct.attrib;
+
+        if (attrib & _A_SUBDIR) {
+            if (!(gs_findFlags & wxDIR))
+                return wxFindNextFile();
+        } else if (gs_findFlags && !(gs_findFlags & wxFILE))
+            return wxFindNextFile();
+
+        result += gs_findDataStruct.name;
+    }
+    */
+    return result;
+}
+
+wxString wxFindNextFile()
+{
+    wxString result;
+    // TODO:
+    return result;
+}
+
+#endif // Unix/Windows/OS/2
 
 // Get current working directory.
 // If buf is NULL, allocates space using new, else
@@ -1466,19 +1653,41 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
   char *cbuf = new char[sz+1];
 #ifdef _MSC_VER
   if (_getcwd(cbuf, sz) == NULL) {
+#elif defined( __WXMAC__)
+	enum
+	{
+		SFSaveDisk = 0x214, CurDirStore = 0x398
+	};
+	FSSpec cwdSpec ;
+	
+	FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
+	wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+	strcpy( buf , res ) ;
+	if (0) {
 #else
   if (getcwd(cbuf, sz) == NULL) {
 #endif
     delete [] cbuf;
-#else
+#else // wxUnicode
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {
+#elif defined( __WXMAC__)
+	enum
+	{
+		SFSaveDisk = 0x214, CurDirStore = 0x398
+	};
+	FSSpec cwdSpec ;
+	
+	FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
+	wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+	strcpy( buf , res ) ;
+	if (0) {
 #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 {
@@ -1503,7 +1712,7 @@ wxString wxGetCwd()
 bool wxSetWorkingDirectory(const wxString& d)
 {
 #if defined( __UNIX__ ) || defined( __WXMAC__ ) || defined(__WXPM__)
-  return (chdir((char*)d.fn_str()) == 0);
+  return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
 #elif defined(__WINDOWS__)
 
 #ifdef __WIN32__
@@ -1560,39 +1769,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)
 {
-  // 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,
+            _("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 wxChar *pszFileName,
@@ -1601,7 +1814,7 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
                              wxString *pstrExt)
 {
     // it can be empty, but it shouldn't be NULL
-    wxCHECK_RET( pszFileName, _T("NULL file name in wxSplitPath") );
+    wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );
 
     const wxChar *pDot = wxStrrchr(pszFileName, wxFILE_SEP_EXT);
 
@@ -1613,14 +1826,18 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
 #else // assume Unix
     const wxChar *pLastSeparator = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
 
-    if ( pDot == pszFileName )
+    if ( pDot )
     {
-        // under Unix files like .profile are treated in a special way
-        pDot = NULL;
+        if ( (pDot == pszFileName) || (*(pDot - 1) == wxFILE_SEP_PATH_UNIX) )
+        {
+            // under Unix, dot may be (and commonly is) the first character of the
+            // filename, don't treat the entire filename as extension in this case
+            pDot = NULL;
+        }
     }
 #endif // MSW/Unix
 
-    if ( pDot < pLastSeparator )
+    if ( pDot && (pDot < pLastSeparator) )
     {
         // the dot is part of the path, not the start of the extension
         pDot = NULL;
@@ -1651,6 +1868,17 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
     }
 }
 
+
+
+time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+{
+    struct stat buf;
+
+    stat(filename.fn_str(), &buf);
+    return buf.st_mtime;
+}
+
+
 //------------------------------------------------------------------------
 // wild character routines
 //------------------------------------------------------------------------
@@ -1661,9 +1889,9 @@ bool wxIsWild( const wxString& pattern )
   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;
-        case _T('\\'):
+        case wxT('\\'):
             if (!*pat++)
                 return FALSE;
         }
@@ -1697,57 +1925,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
-    const wxChar OB = _T('{'), CB = _T('}');
+    const wxChar OB = wxT('{'), CB = wxT('}');
 
     // dot_special means '.' only matches '.'
-    if (dot_special && *str == _T('.') && *pattern != *str)
+    if (dot_special && *str == wxT('.') && *pattern != *str)
         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) {
-        case _T('\\'):
+        case wxT('\\'):
             pattern++;
-            if (*pattern != _T('\0'))
+            if (*pattern != wxT('\0'))
                 pattern++;
             break;
-        case _T('*'):
+        case wxT('*'):
             pattern++;
             ret_code = FALSE;
-            while ((*str!=_T('\0'))
+            while ((*str!=wxT('\0'))
             && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
                 /*loop*/;
             if (ret_code) {
-                while (*str != _T('\0'))
+                while (*str != wxT('\0'))
                     str++;
-                while (*pattern != _T('\0'))
+                while (*pattern != wxT('\0'))
                     pattern++;
             }
             break;
-        case _T('['):
+        case wxT('['):
             pattern++;
           repeat:
-            if ((*pattern == _T('\0')) || (*pattern == _T(']'))) {
+            if ((*pattern == wxT('\0')) || (*pattern == wxT(']'))) {
                 done = TRUE;
                 break;
             }
-            if (*pattern == _T('\\')) {
+            if (*pattern == wxT('\\')) {
                 pattern++;
-                if (*pattern == _T('\0')) {
+                if (*pattern == wxT('\0')) {
                     done = TRUE;
                     break;
                 }
             }
-            if (*(pattern + 1) == _T('-')) {
+            if (*(pattern + 1) == wxT('-')) {
                 c = *pattern;
                 pattern += 2;
-                if (*pattern == _T(']')) {
+                if (*pattern == wxT(']')) {
                     done = TRUE;
                     break;
                 }
-                if (*pattern == _T('\\')) {
+                if (*pattern == wxT('\\')) {
                     pattern++;
-                    if (*pattern == _T('\0')) {
+                    if (*pattern == wxT('\0')) {
                         done = TRUE;
                         break;
                     }
@@ -1761,51 +1989,51 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
                 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++;
             }
-            if (*pattern != _T('\0')) {
+            if (*pattern != wxT('\0')) {
                 pattern++, str++;
             }
             break;
-        case _T('?'):
+        case wxT('?'):
             pattern++;
             str++;
             break;
         case OB:
             pattern++;
-            while ((*pattern != CB) && (*pattern != _T('\0'))) {
+            while ((*pattern != CB) && (*pattern != wxT('\0'))) {
                 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++);
                 }
-                if (*pattern == _T('\0')) {
+                if (*pattern == wxT('\0')) {
                     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 {
-                    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++;
                         }
                     }
                 }
-                if (*pattern != _T('\0'))
+                if (*pattern != wxT('\0'))
                     pattern++;
             }
             break;
@@ -1817,9 +2045,9 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
             }
         }
     }
-    while (*pattern == _T('*'))
+    while (*pattern == wxT('*'))
         pattern++;
-    return ((*str == _T('\0')) && (*pattern == _T('\0')));
+    return ((*str == wxT('\0')) && (*pattern == wxT('\0')));
 };
 
 #endif