Removed #include <typeinfo> (since C++ RTTI is no longer used)

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 1d7119cabe9a70fc12b3b7868bdc209f404fb915..7a8f627a555d2bd5e0724a64582c2376799b9a29 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filefn.cpp
+// Name:        src/common/filefn.cpp

 // Purpose:     File- and directory-related functions
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     File- and directory-related functions
 // Author:      Julian Smart
 // Modified by:


@@ -17,24 +17,29 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "filefn.h"
-#endif
-

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

-#include "wx/defs.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

-#include "wx/utils.h"
-#include "wx/intl.h"
+#include "wx/filefn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/crt.h"
+#endif
+
+#include "wx/dynarray.h"

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

+#include "wx/tokenzr.h"
+

 // there are just too many of those...
 #ifdef __VISUALC__
     #pragma warning(disable:4706)   // assignment within conditional expression
 // there are just too many of those...
 #ifdef __VISUALC__
     #pragma warning(disable:4706)   // assignment within conditional expression


@@ -44,98 +49,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#if !defined(__WATCOMC__)
+#if !wxONLY_WATCOM_EARLIER_THAN(1,4)

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

-  #include  "wx/mac/private.h"  // includes mac headers
-#endif
-
-#ifdef __WXWINCE__
-#include "wx/msw/wince/time.h"
-#include "wx/msw/private.h"
-#else
-#include <time.h>
-#endif
-
-#ifdef __WXWINCE__
-// Nothing
-#elif !defined(__MWERKS__)
-    #include <sys/types.h>
-    #include <sys/stat.h>
-#else
-#ifdef __MACH__
-#include <sys/types.h>
-#include <utime.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#else
-    #include <stat.h>
-    #include <unistd.h>
-    #include <unix.h>
-    #include <fcntl.h>
-#endif
-#endif
-
-#ifdef __UNIX__
-    #include <unistd.h>
-    #include <dirent.h>
-    #include <fcntl.h>
-#endif
-
-#ifdef __WXPM__
-    #include <process.h>
-    #include "wx/os2/private.h"
-#endif
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__)
-    #include <direct.h>
-    #include <dos.h>
-    #include <io.h>
-#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 __BORLANDC__ // Please someone tell me which version of Borland needs
-                    // this (3.1 I believe) and how to test for it.
-                    // If this works for Borland 4.0 as well, then no worries.
-    #include <dir.h>
-#endif
-
-#ifdef __SALFORDC__
-    #include <dir.h>
-    #include <unix.h>
-#endif
-
-#include "wx/log.h"
-
-// No, Cygwin doesn't appear to have fnmatch.h after all.
-#if defined(HAVE_FNMATCH_H)
-    #include "fnmatch.h"
+    #include  "wx/osx/private.h"  // includes mac headers

 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__

-    #include "wx/msw/wrapwin.h"
+    #include "wx/msw/private.h"

     #include "wx/msw/mslu.h"
 
     #include "wx/msw/mslu.h"
 

-    // for _getcwd
-    #ifdef __MINGW32__
-        #include <io.h>
-    #endif
-

     // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
     //
     // note that it must be included after <windows.h>
     // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
     //
     // note that it must be included after <windows.h>


@@ -144,8 +71,18 @@
             #include <sys/cygwin.h>
         #endif
     #endif // __GNUWIN32__
             #include <sys/cygwin.h>
         #endif
     #endif // __GNUWIN32__

+
+    // io.h is needed for _get_osfhandle()
+    // Already included by filefn.h for many Windows compilers
+    #if defined __MWERKS__ || defined __CYGWIN__
+        #include <io.h>
+    #endif

 #endif // __WINDOWS__
 
 #endif // __WINDOWS__
 

+#if defined(__VMS__)
+    #include <fab.h>
+#endif
+

 // TODO: Borland probably has _wgetcwd as well?
 #ifdef _MSC_VER
     #define HAVE_WGETCWD
 // TODO: Borland probably has _wgetcwd as well?
 #ifdef _MSC_VER
     #define HAVE_WGETCWD


@@ -159,17 +96,6 @@
     #define _MAXPATHLEN 1024
 #endif
 
     #define _MAXPATHLEN 1024
 #endif
 

-#ifdef __WXMAC__
-#  ifdef __DARWIN__
-#    include "MoreFilesX.h"
-#  else
-#    include "MoreFiles.h"
-#    include "MoreFilesExtras.h"
-#    include "FullPath.h"
-#    include "FSpCompat.h"
-#  endif
-#endif
-

 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------


@@ -182,179 +108,176 @@ static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 // VisualAge C++ V4.0 cannot have any external linkage const decs
 // in headers included by more than one primary source
 //
 // 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;
+const int wxInvalidOffset = -1;

 #endif
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 #endif
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 

-// we need to translate Mac filenames before passing them to OS functions
+// translate the filenames before passing them to OS functions

 #define OS_FILENAME(s) (s.fn_str())
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 #define OS_FILENAME(s) (s.fn_str())
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-#ifdef wxNEED_WX_UNISTD_H
+// ----------------------------------------------------------------------------
+// wrappers around standard POSIX functions
+// ----------------------------------------------------------------------------

 
 

-WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
-{
-    return stat( wxConvFile.cWX2MB( file_name ), buf );
-}
+#if wxUSE_UNICODE && defined __BORLANDC__ \
+    && __BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551

 
 

-WXDLLEXPORT int wxAccess( const wxChar *pathname, int mode )
+// BCC 5.5 and 5.5.1 have a bug in _wopen where files are created read only
+// regardless of the mode parameter. This hack works around the problem by
+// setting the mode with _wchmod.
+//
+int wxCRT_Open(const wchar_t *pathname, int flags, mode_t mode)

 {
 {

-    return access( wxConvFile.cWX2MB( pathname ), mode );
-}
+    int moreflags = 0;

 
 

-WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode )
-{
-    return open( wxConvFile.cWX2MB( pathname ), flags, mode );
+    // we only want to fix the mode when the file is actually created, so
+    // when creating first try doing it O_EXCL so we can tell if the file
+    // was already there.
+    if ((flags & O_CREAT) && !(flags & O_EXCL) && (mode & wxS_IWUSR) != 0)
+        moreflags = O_EXCL;
+
+    int fd = _wopen(pathname, flags | moreflags, mode);
+
+    // the file was actually created and needs fixing
+    if (fd != -1 && (flags & O_CREAT) != 0 && (mode & wxS_IWUSR) != 0)
+    {
+        close(fd);
+        _wchmod(pathname, mode);
+        fd = _wopen(pathname, flags & ~(O_EXCL | O_CREAT));
+    }
+    // the open failed, but it may have been because the added O_EXCL stopped
+    // the opening of an existing file, so try again without.
+    else if (fd == -1 && moreflags != 0)
+    {
+        fd = _wopen(pathname, flags & ~O_CREAT);
+    }
+
+    return fd;

 }
 
 #endif
 }
 
 #endif

-   // wxNEED_WX_UNISTD_H

 
 // ----------------------------------------------------------------------------
 // wxPathList
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxPathList
 // ----------------------------------------------------------------------------
 

-// IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
-
-static inline wxChar* MYcopystring(const wxString& s)
-{
-    wxChar* copy = new wxChar[s.length() + 1];
-    return wxStrcpy(copy, s.c_str());
-}
-
-static inline wxChar* MYcopystring(const wxChar* s)
+bool wxPathList::Add(const wxString& path)

 {
 {

-    wxChar* copy = new wxChar[wxStrlen(s) + 1];
-    return wxStrcpy(copy, s);
+    // add a path separator to force wxFileName to interpret it always as a directory
+    // (i.e. if we are called with '/home/user' we want to consider it a folder and
+    // not, as wxFileName would consider, a filename).
+    wxFileName fn(path + wxFileName::GetPathSeparator());
+
+    // add only normalized relative/absolute paths
+    // NB: we won't do wxPATH_NORM_DOTS in order to avoid problems when trying to
+    //     normalize paths which starts with ".." (which can be normalized only if
+    //     we use also wxPATH_NORM_ABSOLUTE - which we don't want to use).
+    if (!fn.Normalize(wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS))
+        return false;
+
+    wxString toadd = fn.GetPath();
+    if (Index(toadd) == wxNOT_FOUND)
+        wxArrayString::Add(toadd);      // do not add duplicates
+
+    return true;

 }
 
 }
 

-void wxPathList::Add (const wxString& path)
+void wxPathList::Add(const wxArrayString &arr)

 {
 {

-    wxStringList::Add (WXSTRINGCAST path);
+    for (size_t j=0; j < arr.GetCount(); j++)
+        Add(arr[j]);

 }
 
 // Add paths e.g. from the PATH environment variable
 }
 
 // Add paths e.g. from the PATH environment variable

-void wxPathList::AddEnvList (const wxString& envVariable)
+void wxPathList::AddEnvList (const wxString& WXUNUSED_IN_WINCE(envVariable))

 {
     // No environment variables on WinCE
 #ifndef __WXWINCE__
 {
     // No environment variables on WinCE
 #ifndef __WXWINCE__

+
+    // The space has been removed from the tokenizers, otherwise a
+    // path such as "C:\Program Files" would be split into 2 paths:
+    // "C:\Program" and "Files"; this is true for both Windows and Unix.
+

     static const wxChar PATH_TOKS[] =
     static const wxChar PATH_TOKS[] =

-#ifdef __WINDOWS__
-        /*
-        The space has been removed from the tokenizers, otherwise a
-        path such as "C:\Program Files" would be split into 2 paths:
-        "C:\Program" and "Files"
-        */
-//        wxT(" ;"); // Don't seperate with colon in DOS (used for drive)
-        wxT(";"); // Don't seperate with colon in DOS (used for drive)
+#if defined(__WINDOWS__) || defined(__OS2__)
+        wxT(";"); // Don't separate with colon in DOS (used for drive)

 #else
 #else

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

 #endif
 
 #endif
 

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

     {
     {

-        wxChar *s = MYcopystring (val);
-        wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
-
-        if (token)
-        {
-            Add(token);
-            while (token)
-            {
-                if ( (token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr))
-                    != NULL )
-                {
-                    Add(token);
-                }
-            }
-        }
-
-        // suppress warning about unused variable save_ptr when wxStrtok() is a
-        // macro which throws away its third argument
-        save_ptr = token;
-
-        delete [] s;
+        // split into an array of string the value of the env var
+        wxArrayString arr = wxStringTokenize(val, PATH_TOKS);
+        WX_APPEND_ARRAY(*this, arr);

     }
     }

-#endif
+#endif // !__WXWINCE__

 }
 
 // Given a full filename (with path), ensure that that file can
 // be accessed again USING FILENAME ONLY by adding the path
 // to the list if not already there.
 }
 
 // Given a full filename (with path), ensure that that file can
 // be accessed again USING FILENAME ONLY by adding the path
 // to the list if not already there.

-void wxPathList::EnsureFileAccessible (const wxString& path)
+bool wxPathList::EnsureFileAccessible (const wxString& path)

 {
 {

-    wxString path_only(wxPathOnly(path));
-    if ( !path_only.IsEmpty() )
-    {
-        if ( !Member(path_only) )
-            Add(path_only);
-    }
+    return Add(wxPathOnly(path));

 }
 
 }
 

-bool wxPathList::Member (const wxString& path)
+#if WXWIN_COMPATIBILITY_2_6
+bool wxPathList::Member (const wxString& path) const

 {
 {

-  for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
-  {
-      wxString path2( node->GetData() );
-      if (
-#if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__)
-      // Case INDEPENDENT
-          path.CompareTo (path2, wxString::ignoreCase) == 0
-#else
-      // Case sensitive File System
-          path.CompareTo (path2) == 0
-#endif
-        )
-        return TRUE;
-  }
-  return FALSE;
+    return Index(path) != wxNOT_FOUND;

 }
 }

+#endif

 
 

-wxString wxPathList::FindValidPath (const wxString& file)
+wxString wxPathList::FindValidPath (const wxString& file) const

 {
 {

-  if (wxFileExists (wxExpandPath(wxFileFunctionsBuffer, file)))
-    return wxString(wxFileFunctionsBuffer);
-
-  wxChar buf[_MAXPATHLEN];
-  wxStrcpy(buf, wxFileFunctionsBuffer);
+    // normalize the given string as it could be a path + a filename
+    // and not only a filename
+    wxFileName fn(file);
+    wxString strend;
+
+    // NB: normalize without making absolute otherwise calling this function with
+    //     e.g. "b/c.txt" would result in removing the directory 'b' and the for loop
+    //     below would only add to the paths of this list the 'c.txt' part when doing
+    //     the existence checks...
+    // NB: we don't use wxPATH_NORM_DOTS here, too (see wxPathList::Add for more info)
+    if (!fn.Normalize(wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS))
+        return wxEmptyString;

 
 

-  wxChar *filename = wxIsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
+    wxASSERT_MSG(!fn.IsDir(), wxT("Cannot search for directories; only for files"));
+    if (fn.IsAbsolute())
+        strend = fn.GetFullName();      // search for the file name and ignore the path part
+    else
+        strend = fn.GetFullPath();

 
 

-  for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
+    for (size_t i=0; i<GetCount(); i++)

     {
     {

-      const wxChar *path = node->GetData();
-      wxStrcpy (wxFileFunctionsBuffer, path);
-      wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
-      if (ch != wxT('\\') && ch != wxT('/'))
-        wxStrcat (wxFileFunctionsBuffer, wxT("/"));
-      wxStrcat (wxFileFunctionsBuffer, filename);
-#ifdef __WINDOWS__
-      wxUnix2DosFilename (wxFileFunctionsBuffer);
-#endif
-      if (wxFileExists (wxFileFunctionsBuffer))
-      {
-        return wxString(wxFileFunctionsBuffer);        // Found!
-      }
-    }                                // for()
+        wxString strstart = Item(i);
+        if (!strstart.IsEmpty() && strstart.Last() != wxFileName::GetPathSeparator())
+            strstart += wxFileName::GetPathSeparator();
+
+        if (wxFileExists(strstart + strend))
+            return strstart + strend;        // Found!
+    }

 
 

-  return wxEmptyString;                    // Not found
+    return wxEmptyString;                    // Not found

 }
 
 }
 

-wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
+wxString wxPathList::FindAbsoluteValidPath (const wxString& file) const

 {
     wxString f = FindValidPath(file);
 {
     wxString f = FindValidPath(file);

-    if ( wxIsAbsolutePath(f) )
+    if ( f.empty() || wxIsAbsolutePath(f) )

         return f;
 
         return f;
 

-    wxString buf;
-    wxGetWorkingDirectory(wxStringBuffer(buf, _MAXPATHLEN), _MAXPATHLEN);
+    wxString buf = ::wxGetCwd();

 
     if ( !wxEndsWithPathSeparator(buf) )
     {
 
     if ( !wxEndsWithPathSeparator(buf) )
     {


@@ -365,51 +288,72 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
     return buf;
 }
 
     return buf;
 }
 

+// ----------------------------------------------------------------------------
+// miscellaneous global functions (TOFIX!)
+// ----------------------------------------------------------------------------
+
+static inline wxChar* MYcopystring(const wxString& s)
+{
+    wxChar* copy = new wxChar[s.length() + 1];
+    return wxStrcpy(copy, s.c_str());
+}
+
+template<typename CharType>
+static inline CharType* MYcopystring(const CharType* s)
+{
+    CharType* copy = new CharType[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}
+
+

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

+#if defined(__WXPALMOS__)
+    return false;
+#elif defined(__WIN32__) && !defined(__WXMICROWIN__)

     // we must use GetFileAttributes() instead of the ANSI C functions because
     // it can cope with network (UNC) paths unlike them
     // we must use GetFileAttributes() instead of the ANSI C functions because
     // it can cope with network (UNC) paths unlike them

-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-    DWORD ret = ::GetFileAttributes(filename);
+    DWORD ret = ::GetFileAttributes(filename.fn_str());

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

+    #ifndef S_ISREG
+        #define S_ISREG(mode) ((mode) & S_IFREG)
+    #endif

     wxStructStat st;
     wxStructStat st;

-    return wxStat(filename, &st) == 0 && (st.st_mode & S_IFREG);
+#ifndef wxNEED_WX_UNISTD_H
+    return (wxStat( filename.fn_str() , &st) == 0 && S_ISREG(st.st_mode))
+#ifdef __OS2__
+      || (errno == EACCES) // if access is denied something with that name
+                            // exists and is opened in exclusive mode.
+#endif
+      ;
+#else
+    return wxStat( filename , &st) == 0 && S_ISREG(st.st_mode);
+#endif

 #endif // __WIN32__/!__WIN32__
 }
 
 bool
 wxIsAbsolutePath (const wxString& filename)
 {
 #endif // __WIN32__/!__WIN32__
 }
 
 bool
 wxIsAbsolutePath (const wxString& filename)
 {

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

     {
     {

-#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('/'))
         // Unix like or Windows
         if (filename[0] == wxT('/'))

-            return TRUE;
-#endif
+            return true;

 #ifdef __VMS__
         if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
 #ifdef __VMS__
         if ((filename[0] == wxT('[') && filename[1] != wxT('.')))

-            return TRUE;
+            return true;

 #endif
 #endif

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

         // MSDOS like
         if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
         // MSDOS like
         if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))

-            return TRUE;
+            return true;

 #endif
     }
 #endif
     }

-    return FALSE ;
+    return false ;

 }
 
 /*
 }
 
 /*


@@ -418,48 +362,50 @@ wxIsAbsolutePath (const wxString& filename)
  *
  */
 
  *
  */
 

-void wxStripExtension(wxChar *buffer)
+template<typename T>
+static void wxDoStripExtension(T *buffer)

 {
 {

-  int len = wxStrlen(buffer);
-  int i = len-1;
-  while (i > 0)
-  {
-    if (buffer[i] == wxT('.'))
+    int len = wxStrlen(buffer);
+    int i = len-1;
+    while (i > 0)

     {
     {

-      buffer[i] = 0;
-      break;
+        if (buffer[i] == wxT('.'))
+        {
+            buffer[i] = 0;
+            break;
+        }
+        i --;

     }
     }

-    i --;
-  }

 }
 
 }
 

+void wxStripExtension(char *buffer) { wxDoStripExtension(buffer); }
+void wxStripExtension(wchar_t *buffer) { wxDoStripExtension(buffer); }
+

 void wxStripExtension(wxString& buffer)
 {
 void wxStripExtension(wxString& buffer)
 {

-  size_t len = buffer.Length();
-  size_t i = len-1;
-  while (i > 0)
-  {
-    if (buffer.GetChar(i) == wxT('.'))
+    //RN:  Be careful about the handling the case where
+    //buffer.length() == 0
+    for(size_t i = buffer.length() - 1; i != wxString::npos; --i)

     {
     {

-      buffer = buffer.Left(i);
-      break;
+        if (buffer.GetChar(i) == wxT('.'))
+        {
+          buffer = buffer.Left(i);
+          break;
+        }

     }
     }

-    i --;
-  }

 }
 
 // Destructive removal of /./ and /../ stuff
 }
 
 // Destructive removal of /./ and /../ stuff

-wxChar *wxRealPath (wxChar *path)
+template<typename CharType>
+static CharType *wxDoRealPath (CharType *path)

 {
 {

+  static const CharType SEP = wxFILE_SEP_PATH;

 #ifdef __WXMSW__
 #ifdef __WXMSW__

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

   wxUnix2DosFilename(path);
   wxUnix2DosFilename(path);

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

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

-    wxChar *p;
+    CharType *p;

     if (path[2] == SEP && path[1] == wxT('.'))
       p = &path[0];
     else
     if (path[2] == SEP && path[1] == wxT('.'))
       p = &path[0];
     else


@@ -470,7 +416,7 @@ wxChar *wxRealPath (wxChar *path)
           {
             if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
               {
           {
             if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
               {

-                wxChar *q;
+                CharType *q;

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


@@ -485,7 +431,7 @@ wxChar *wxRealPath (wxChar *path)
                         path[0] = SEP;
                         path[1] = wxT('\0');
                       }
                         path[0] = SEP;
                         path[1] = wxT('\0');
                       }

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

                     /* Check that path[2] is NULL! */
                     else if (path[1] == wxT(':') && !path[2])
                       {
                     /* Check that path[2] is NULL! */
                     else if (path[1] == wxT(':') && !path[2])
                       {


@@ -504,28 +450,48 @@ wxChar *wxRealPath (wxChar *path)
   return path;
 }
 
   return path;
 }
 

+char *wxRealPath(char *path)
+{
+    return wxDoRealPath(path);
+}
+
+wchar_t *wxRealPath(wchar_t *path)
+{
+    return wxDoRealPath(path);
+}
+
+wxString wxRealPath(const wxString& path)
+{
+    wxChar *buf1=MYcopystring(path);
+    wxChar *buf2=wxRealPath(buf1);
+    wxString buf(buf2);
+    delete [] buf1;
+    return buf;
+}
+
+

 // Must be destroyed
 wxChar *wxCopyAbsolutePath(const wxString& filename)
 {
 // Must be destroyed
 wxChar *wxCopyAbsolutePath(const wxString& filename)
 {

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

 
 

-  if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
-    wxChar  buf[_MAXPATHLEN];
-    buf[0] = wxT('\0');
-    wxGetWorkingDirectory(buf, WXSIZEOF(buf));
-    wxChar ch = buf[wxStrlen(buf) - 1];
+    if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename)))
+    {
+        wxString buf = ::wxGetCwd();
+        wxChar ch = buf.Last();

 #ifdef __WXMSW__
 #ifdef __WXMSW__

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

 #else
 #else

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

 #endif
 #endif

-    wxStrcat(buf, wxFileFunctionsBuffer);
-    return MYcopystring( wxRealPath(buf) );
-  }
-  return MYcopystring( wxFileFunctionsBuffer );
+        buf << wxFileFunctionsBuffer;
+        buf = wxRealPath( buf );
+        return MYcopystring( buf );
+    }
+    return MYcopystring( wxFileFunctionsBuffer );

 }
 
 /*-
 }
 
 /*-


@@ -551,38 +517,39 @@ wxChar *wxCopyAbsolutePath(const wxString& filename)
 
 /* input name in name, pathname output to buf. */
 
 
 /* input name in name, pathname output to buf. */
 

-wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
+template<typename CharType>
+static CharType *wxDoExpandPath(CharType *buf, const wxString& name)

 {
 {

-    register wxChar *d, *s, *nm;
-    wxChar          lnm[_MAXPATHLEN];
+    register CharType *d, *s, *nm;
+    CharType        lnm[_MAXPATHLEN];

     int             q;
 
     // Some compilers don't like this line.
     int             q;
 
     // Some compilers don't like this line.

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

 
 

-    wxChar      trimchars[4];
+    CharType      trimchars[4];

     trimchars[0] = wxT('\n');
     trimchars[1] = wxT(' ');
     trimchars[2] = wxT('\t');
     trimchars[3] = 0;
 
     trimchars[0] = wxT('\n');
     trimchars[1] = wxT(' ');
     trimchars[2] = wxT('\t');
     trimchars[3] = 0;
 

+    static const CharType SEP = wxFILE_SEP_PATH;

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-     const wxChar     SEP = wxT('\\');
-#else
-     const wxChar     SEP = wxT('/');
+    //wxUnix2DosFilename(path);

 #endif
 #endif

+

     buf[0] = wxT('\0');
     buf[0] = wxT('\0');

-    if (name == NULL || *name == wxT('\0'))
+    if (name.empty())

         return buf;
         return buf;

-    nm = MYcopystring(name); // Make a scratch copy
-    wxChar *nm_tmp = nm;
+    nm = ::MYcopystring(static_cast<const CharType*>(name.c_str())); // Make a scratch copy
+    CharType *nm_tmp = nm;

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

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

         nm++;
     /* And strip off trailing whitespace and cr */
     s = nm + (q = wxStrlen(nm)) - 1;
         nm++;
     /* And strip off trailing whitespace and cr */
     s = nm + (q = wxStrlen(nm)) - 1;

-    while (q-- && wxStrchr((wxChar *)trimchars, *s) != NULL)
+    while (q-- && wxStrchr(trimchars, *s) != NULL)

         *s = wxT('\0');
 
     s = nm;
         *s = wxT('\0');
 
     s = nm;


@@ -614,7 +581,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     while ((*d++ = *s) != 0) {
 #  ifndef __WXMSW__
         if (*s == wxT('\\')) {
     while ((*d++ = *s) != 0) {
 #  ifndef __WXMSW__
         if (*s == wxT('\\')) {

-            if ((*(d - 1) = *++s)) {
+            if ((*(d - 1) = *++s)!=0) {

                 s++;
                 continue;
             } else
                 s++;
                 continue;
             } else


@@ -630,9 +597,9 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
         if (*s++ == wxT('$'))
 #endif
         {
         if (*s++ == wxT('$'))
 #endif
         {

-            register wxChar  *start = d;
+            register CharType  *start = d;

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

-            register wxChar  *value;
+            register CharType  *value;

             while ((*d++ = *s) != 0)
                 if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
                     break;
             while ((*d++ = *s) != 0)
                 if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
                     break;


@@ -656,21 +623,22 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     }
 
     /* Expand ~ and ~user */
     }
 
     /* Expand ~ and ~user */

+    wxString homepath;

     nm = lnm;
     if (nm[0] == wxT('~') && !q)
     {
         /* prefix ~ */
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */
     nm = lnm;
     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(wxT(""))) != NULL) {
+            homepath = wxGetUserHome(wxEmptyString);
+            if (!homepath.empty()) {
+                s = (CharType*)(const CharType*)homepath.c_str();

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

-            register wxChar  *nnm;
-            register wxChar  *home;
+            register CharType  *nnm;

             for (s = nm; *s && *s != SEP; s++)
             {
                 // Empty
             for (s = nm; *s && *s != SEP; s++)
             {
                 // Empty


@@ -679,14 +647,17 @@ 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
-            if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) {
-               if (was_sep) /* replace only if it was there: */
-                   *s = SEP;
+            homepath = wxGetUserHome(wxString(nm + 1));
+            if (homepath.empty())
+            {
+                if (was_sep) /* replace only if it was there: */
+                    *s = SEP;

                 s = NULL;
                 s = NULL;

-            } else {
+            }
+            else
+            {

                 nm = nnm;
                 nm = nnm;

-                s = home;
+                s = (CharType*)(const CharType*)homepath.c_str();

             }
         }
     }
             }
         }
     }


@@ -710,6 +681,17 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     return wxRealPath(buf);
 }
 
     return wxRealPath(buf);
 }
 

+char *wxExpandPath(char *buf, const wxString& name)
+{
+    return wxDoExpandPath(buf, name);
+}
+
+wchar_t *wxExpandPath(wchar_t *buf, const wxString& name)
+{
+    return wxDoExpandPath(buf, name);
+}
+
+

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


@@ -718,46 +700,53 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
    The call wxExpandPath can convert these back!
  */
 wxChar *
    The call wxExpandPath can convert these back!
  */
 wxChar *

-wxContractPath (const wxString& filename, const wxString& envname, const wxString& user)
+wxContractPath (const wxString& filename,
+                const wxString& WXUNUSED_IN_WINCE(envname),
+                const wxString& user)

 {
   static wxChar dest[_MAXPATHLEN];
 
 {
   static wxChar dest[_MAXPATHLEN];
 

-  if (filename == wxT(""))
+  if (filename.empty())

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

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

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

-  const wxChar *val;
+  wxString val;

 #ifndef __WXWINCE__
   wxChar *tcp;
 #ifndef __WXWINCE__
   wxChar *tcp;

-  if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
+  if (!envname.empty() && !(val = wxGetenv (envname)).empty() &&

      (tcp = wxStrstr (dest, val)) != NULL)
     {
      (tcp = wxStrstr (dest, val)) != NULL)
     {

-        wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));
+        wxStrcpy (wxFileFunctionsBuffer, tcp + val.length());

         *tcp++ = wxT('$');
         *tcp++ = wxT('{');
         *tcp++ = wxT('$');
         *tcp++ = wxT('{');

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

         wxStrcat (tcp, wxT("}"));
         wxStrcat (tcp, wxFileFunctionsBuffer);
     }
 #endif
 
   // Handle User's home (ignore root homes!)
         wxStrcat (tcp, wxT("}"));
         wxStrcat (tcp, wxFileFunctionsBuffer);
     }
 #endif
 
   // Handle User's home (ignore root homes!)

-  size_t len;
-  if ((val = wxGetUserHome (user)) != NULL &&
-      (len = wxStrlen(val)) > 2 &&
-      wxStrncmp(dest, val, len) == 0)
-    {
-      wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
-      if (user != wxT(""))
-             wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
-      wxStrcat(wxFileFunctionsBuffer, dest + len);
-      wxStrcpy (dest, wxFileFunctionsBuffer);
-    }
+  val = wxGetUserHome (user);
+  if (val.empty())
+    return dest;
+
+  const size_t len = val.length();
+  if (len <= 2)
+    return dest;
+
+  if (wxStrncmp(dest, val, len) == 0)
+  {
+    wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
+    if (!user.empty())
+           wxStrcat(wxFileFunctionsBuffer, user);
+    wxStrcat(wxFileFunctionsBuffer, dest + len);
+    wxStrcpy (dest, wxFileFunctionsBuffer);
+  }

 
   return dest;
 }
 
   return dest;
 }


@@ -802,22 +791,12 @@ wxPathOnly (wxChar *path)
         // Search backward for a backward or forward slash
         while (i > -1)
         {
         // Search backward for a backward or forward slash
         while (i > -1)
         {

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

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

-#endif

 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {
 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {


@@ -828,7 +807,7 @@ wxPathOnly (wxChar *path)
             i --;
         }
 
             i --;
         }
 

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

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


@@ -845,35 +824,28 @@ wxPathOnly (wxChar *path)
 // Return just the directory, or NULL if no directory
 wxString wxPathOnly (const wxString& path)
 {
 // Return just the directory, or NULL if no directory
 wxString wxPathOnly (const wxString& path)
 {

-    if (path != wxT(""))
+    if (!path.empty())

     {
         wxChar buf[_MAXPATHLEN];
 
         // Local copy
     {
         wxChar buf[_MAXPATHLEN];
 
         // Local copy

-        wxStrcpy (buf, WXSTRINGCAST path);
+        wxStrcpy(buf, path);

 
 

-        int l = path.Length();
+        int l = path.length();

         int i = l - 1;
 
         // Search backward for a backward or forward slash
         while (i > -1)
         {
         int i = l - 1;
 
         // Search backward for a backward or forward slash
         while (i > -1)
         {

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

             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {
             // Unix like or Windows
             if (path[i] == wxT('/') || path[i] == wxT('\\'))
             {

+                // Don't return an empty string
+                if (i == 0)
+                    i ++;

                 buf[i] = 0;
                 return wxString(buf);
             }
                 buf[i] = 0;
                 return wxString(buf);
             }

-#endif

 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {
 #ifdef __VMS__
             if (path[i] == wxT(']'))
             {


@@ -884,7 +856,7 @@ wxString wxPathOnly (const wxString& path)
             i --;
         }
 
             i --;
         }
 

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

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


@@ -895,213 +867,93 @@ wxString wxPathOnly (const wxString& path)
         }
 #endif
     }
         }
 #endif
     }

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

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

-#if defined(__WXMAC__)
-wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
-{
-#ifdef __DARWIN__
-    int         i;
-    int         j;
-    OSErr       theErr;
-    OSStatus    theStatus;
-    Boolean     isDirectory = FALSE;
-    Str255    theParentPath = "\p";
-    FSSpec      theParentSpec;
-    FSRef       theParentRef;
-    char        theFileName[FILENAME_MAX];
-    char        thePath[FILENAME_MAX];
-
-    strcpy(thePath, "");
-
-    // GD: Separate file name from path and make a FSRef to the parent
-    //     directory. This is necessary since FSRefs cannot reference files
-    //     that have not yet been created.
-    //     Based on example code from Apple Technical Note TN2022
-    //       http://developer.apple.com/technotes/tn/tn2022.html
-
-    // check whether we are converting a directory
-    isDirectory = ((spec->name)[spec->name[0]] == ':');
-    // count length of file name
-    for (i = spec->name[0] - (isDirectory ? 1 : 0); ((spec->name[i] != ':') && (i > 0)); i--);
-    // copy file name
-    //   prepend path separator since it will later be appended to the path
-    theFileName[0] = wxFILE_SEP_PATH;
-    for (j = i + 1; j <= spec->name[0] - (isDirectory ? 1 : 0); j++) {
-        theFileName[j - i] = spec->name[j];
-    }
-    theFileName[j - i] = '\0';
-    // copy path if any
-    for (j = 1; j <= i; j++) {
-        theParentPath[++theParentPath[0]] = spec->name[j];
-    }
-    theErr = FSMakeFSSpec(spec->vRefNum, spec->parID, theParentPath, &theParentSpec);
-    if (theErr == noErr) {
-        // convert the FSSpec to an FSRef
-        theErr = FSpMakeFSRef(&theParentSpec, &theParentRef);
-    }
-    if (theErr == noErr) {
-        // get the POSIX path associated with the FSRef
-        theStatus = FSRefMakePath(&theParentRef,
-                                  (UInt8 *)thePath, sizeof(thePath));
-    }
-    if (theStatus == noErr) {
-        // append file name to path
-        //   includes previously prepended path separator
-        strcat(thePath, theFileName);
-    }
+#if defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)

 
 

-    // create path string for return value
-    wxString result( thePath , wxConvLocal) ;
-#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( *myPath , wxConvLocal) ;
-
-    // free allocated handle
-    ::HUnlock( myPath ) ;
-    ::DisposeHandle( myPath ) ;
-#endif
+#define kDefaultPathStyle kCFURLPOSIXPathStyle

 
 

-    return result ;
+wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
+{
+    CFURLRef fullURLRef;
+    fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
+    if ( additionalPathComponent )
+    {
+        CFURLRef parentURLRef = fullURLRef ;
+        fullURLRef = CFURLCreateCopyAppendingPathComponent(NULL, parentURLRef,
+            additionalPathComponent,false);
+        CFRelease( parentURLRef ) ;
+    }
+    CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle);
+    CFRelease( fullURLRef ) ;
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
+    CFRelease( cfString );
+    CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
+    return wxCFStringRef(cfMutableString).AsString();

 }
 }

-#ifndef __DARWIN__
-// Mac file names are POSIX (Unix style) under Darwin
-// therefore the conversion functions below are not needed
-
-static wxChar sMacFileNameConversion[ 1000 ] ;
-static char scMacFileNameConversion[ 1000 ] ;

 
 

-#endif
-void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
+OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )

 {
     OSStatus err = noErr ;
 {
     OSStatus err = noErr ;

-#ifdef __DARWIN__
-    FSRef theRef;
-
-    // get the FSRef associated with the POSIX path
-    err = FSPathMakeRef((const UInt8 *) path, &theRef, NULL);
-    // convert the FSRef to an FSSpec
-    err = FSGetCatalogInfo(&theRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
-#else
-    if ( strchr( path , ':' ) == NULL )
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(path));
+    CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
+    CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
+    CFRelease( cfMutableString );
+    if ( NULL != url )

     {
     {

-        // try whether it is a volume / or a mounted volume
-        strncpy( scMacFileNameConversion , path , 1000 ) ;
-        scMacFileNameConversion[998] = 0 ;
-        strcat( scMacFileNameConversion , ":" ) ;
-        err = FSpLocationFromFullPath( strlen(scMacFileNameConversion) , scMacFileNameConversion , spec ) ;
+        if ( CFURLGetFSRef(url, fsRef) == false )
+            err = fnfErr ;
+        CFRelease( url ) ;

     }
     else
     {
     }
     else
     {

-        err = FSpLocationFromFullPath( strlen(path) , path , spec ) ;
+        err = fnfErr ;

     }
     }

-#endif
+    return err ;

 }
 
 }
 

-#if wxUSE_UNICODE
-WXDLLEXPORT void wxMacFilename2FSSpec( const wxChar *path , FSSpec *spec ) 
+wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )

 {
 {

-    return wxMacFilename2FSSpec( wxConvFile.cWC2MB(path) , spec ) ;
+    CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
+                                                      uniname->unicode,
+                                                      uniname->length );
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
+    CFRelease( cfname );
+    CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
+    return wxCFStringRef(cfMutableString).AsString() ;

 }
 }

-#endif
-
-#ifndef __DARWIN__

 
 

-wxString wxMac2UnixFilename (const wxChar *str)
-{
-    wxChar *s = sMacFileNameConversion ;
-    wxStrcpy( s , str ) ;
-    if (s)
-    {
-        memmove( s+1 , s ,wxStrlen( s ) + 1 * sizeof(wxChar)) ;
-        if ( *s == ':' )
-            *s = '.' ;
-        else
-            *s = '/' ;
-
-        while (*s)
-        {
-            if (*s == ':')
-                *s = '/';
-            else
-                *s = wxTolower(*s);        // Case INDEPENDENT
-            s++;
-        }
-    }
-    return wxString(sMacFileNameConversion) ;
-}
+#ifndef __LP64__

 
 

-wxString wxUnix2MacFilename (const wxChar *str)
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )

 {
 {

-    wxChar *s = sMacFileNameConversion ;
-    wxStrcpy( s , str ) ;
-    if (s)
+    FSRef fsRef ;
+    if ( FSpMakeFSRef( spec , &fsRef) == noErr )

     {
     {

-        if ( *s == '.' )
-        {
-            // relative path , since it goes on with slash which is translated to a :
-            memmove( s , s+1 ,wxStrlen( s ) * sizeof(wxChar)) ;
-        }
-        else if ( *s == '/' )
-        {
-            // absolute path -> on mac just start with the drive name
-            memmove( s , s+1 ,wxStrlen( s ) * sizeof(wxChar) ) ;
-        }
-        else
-        {
-            wxASSERT_MSG( 1 , wxT("unkown path beginning") ) ;
-        }
-        while (*s)
-        {
-            if (*s == '/' || *s == '\\')
-            {
-                // convert any back-directory situations
-                if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) )
-                {
-                    *s = ':';
-                    memmove( s+1 , s+3 ,(wxStrlen( s+3 ) + 1)*sizeof(wxChar) ) ;
-                }
-                else
-                    *s = ':';
-            }
-            s++ ;
-        }
+        return wxMacFSRefToPath( &fsRef ) ;

     }
     }

-    return wxString(sMacFileNameConversion) ;
+    return wxEmptyString ;

 }
 
 }
 

-wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
+void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )

 {
 {

-    return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
+    OSStatus err = noErr;
+    FSRef fsRef;
+    wxMacPathToFSRef( path , &fsRef );
+       err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
+    verify_noerr( err );

 }
 }

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

 
 #endif // __WXMAC__
 
 
 #endif // __WXMAC__
 

-void
-wxDos2UnixFilename (wxChar *s)
+template<typename T>
+static void wxDoDos2UnixFilename(T *s)

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


@@ -1110,21 +962,25 @@ wxDos2UnixFilename (wxChar *s)
           *s = _T('/');
 #ifdef __WXMSW__
         else
           *s = _T('/');
 #ifdef __WXMSW__
         else

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

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

-void
-#if defined(__WXMSW__) || defined(__WXPM__)
-wxUnix2DosFilename (wxChar *s)
+void wxDos2UnixFilename(char *s) { wxDoDos2UnixFilename(s); }
+void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); }
+
+template<typename T>
+static void
+#if defined(__WXMSW__) || defined(__OS2__)
+wxDoUnix2DosFilename(T *s)

 #else
 #else

-wxUnix2DosFilename (wxChar *WXUNUSED(s) )
+wxDoUnix2DosFilename(T *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

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

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


@@ -1135,45 +991,92 @@ wxUnix2DosFilename (wxChar *WXUNUSED(s) )
 #endif
 }
 
 #endif
 }
 

+void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); }
+void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); }
+

 // Concatenate two files to form third
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {
 // Concatenate two files to form third
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {

-  wxString outfile;
-  if ( !wxGetTempFileName( wxT("cat"), outfile) )
-      return FALSE;
-
-  FILE *fp1 wxDUMMY_INITIALIZE(NULL);
-  FILE *fp2 = NULL;
-  FILE *fp3 = NULL;
-  // Open the inputs and outputs
-  if ((fp1 = wxFopen ( file1, wxT("rb"))) == NULL ||
-      (fp2 = wxFopen ( file2, wxT("rb"))) == NULL ||
-      (fp3 = wxFopen ( outfile, wxT("wb"))) == NULL)
+#if wxUSE_FILE
+
+    wxFile in1(file1), in2(file2);
+    wxTempFile out(file3);
+
+    if ( !in1.IsOpened() || !in2.IsOpened() || !out.IsOpened() )
+        return false;
+
+    ssize_t ofs;
+    unsigned char buf[1024];
+
+    for( int i=0; i<2; i++)

     {
     {

-      if (fp1)
-        fclose (fp1);
-      if (fp2)
-        fclose (fp2);
-      if (fp3)
-        fclose (fp3);
-      return FALSE;
+        wxFile *in = i==0 ? &in1 : &in2;
+        do{
+            if ( (ofs = in->Read(buf,WXSIZEOF(buf))) == wxInvalidOffset ) return false;
+            if ( ofs > 0 )
+                if ( !out.Write(buf,ofs) )
+                    return false;
+        } while ( ofs == (ssize_t)WXSIZEOF(buf) );

     }
 
     }
 

-  int ch;
-  while ((ch = getc (fp1)) != EOF)
-    (void) putc (ch, fp3);
-  fclose (fp1);
+    return out.Commit();
+
+#else
+
+    wxUnusedVar(file1);
+    wxUnusedVar(file2);
+    wxUnusedVar(file3);
+    return false;
+
+#endif
+}
+
+// helper of generic implementation of wxCopyFile()
+#if !(defined(__WIN32__) || defined(__OS2__) || defined(__PALMOS__)) && \
+    wxUSE_FILE
+
+static bool
+wxDoCopyFile(wxFile& fileIn,
+             const wxStructStat& fbuf,
+             const wxString& filenameDst,
+             bool overwrite)
+{
+    // reset the umask as we want to create the file with exactly the same
+    // permissions as the original one
+    wxCHANGE_UMASK(0);
+
+    // create file2 with the same permissions than file1 and open it for
+    // writing
+
+    wxFile fileOut;
+    if ( !fileOut.Create(filenameDst, overwrite, fbuf.st_mode & 0777) )
+        return false;
+
+    // copy contents of file1 to file2
+    char buf[4096];
+    for ( ;; )
+    {
+        ssize_t count = fileIn.Read(buf, WXSIZEOF(buf));
+        if ( count == wxInvalidOffset )
+            return false;

 
 

-  while ((ch = getc (fp2)) != EOF)
-    (void) putc (ch, fp3);
-  fclose (fp2);
+        // end of file?
+        if ( !count )
+            break;

 
 

-  fclose (fp3);
-  bool result = wxRenameFile(outfile, file3);
-  return result;
+        if ( fileOut.Write(buf, count) < (size_t)count )
+            return false;
+    }
+
+    // we can expect fileIn to be closed successfully, but we should ensure
+    // that fileOut was closed as some write errors (disk full) might not be
+    // detected before doing this
+    return fileIn.Close() && fileOut.Close();

 }
 
 }
 

+#endif // generic implementation of wxCopyFile
+

 // Copy files
 bool
 wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
 // Copy files
 bool
 wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)


@@ -1183,17 +1086,20 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
     // instead of our code if available
     //
     // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
     // instead of our code if available
     //
     // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite

-    if ( !::CopyFile(file1, file2, !overwrite) )
+    if ( !::CopyFile(file1.fn_str(), file2.fn_str(), !overwrite) )

     {
         wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
                       file1.c_str(), file2.c_str());
 
     {
         wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
                       file1.c_str(), file2.c_str());
 

-        return FALSE;
+        return false;

     }
     }

-#elif defined(__WXPM__)
-    if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )
-        return FALSE;
-#else // !Win32
+#elif defined(__OS2__)
+    if ( ::DosCopy(file1.c_str(), file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )
+        return false;
+#elif defined(__PALMOS__)
+    // TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/
+    return false;
+#elif wxUSE_FILE // !Win32

 
     wxStructStat fbuf;
     // get permissions of file1
 
     wxStructStat fbuf;
     // get permissions of file1


@@ -1203,13 +1109,13 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
         // from it anyhow
         wxLogSysError(_("Impossible to get permissions for file '%s'"),
                       file1.c_str());
         // from it anyhow
         wxLogSysError(_("Impossible to get permissions for file '%s'"),
                       file1.c_str());

-        return FALSE;
+        return false;

     }
 
     // open file1 for reading
     wxFile fileIn(file1, wxFile::read);
     if ( !fileIn.IsOpened() )
     }
 
     // open file1 for reading
     wxFile fileIn(file1, wxFile::read);
     if ( !fileIn.IsOpened() )

-        return FALSE;
+        return false;

 
     // remove file2, if it exists. This is needed for creating
     // file2 with the correct permissions in the next step
 
     // remove file2, if it exists. This is needed for creating
     // file2 with the correct permissions in the next step


@@ -1217,49 +1123,52 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
     {
         wxLogSysError(_("Impossible to overwrite the file '%s'"),
                       file2.c_str());
     {
         wxLogSysError(_("Impossible to overwrite the file '%s'"),
                       file2.c_str());

-        return FALSE;
+        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__
+    wxDoCopyFile(fileIn, fbuf, file2, overwrite);

 
 

-    // 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;
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+    // copy the resource fork of the file too if it's present
+    wxString pathRsrcOut;
+    wxFile fileRsrcIn;

 
 

-#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;
+        // suppress error messages from this block as resource forks don't have
+        // to exist
+        wxLogNull noLog;
+
+        // it's not enough to check for file existence: it always does on HFS
+        // but is empty for files without resources
+        if ( fileRsrcIn.Open(file1 + wxT("/..namedfork/rsrc")) &&
+                fileRsrcIn.Length() > 0 )
+        {
+            // we must be using HFS or another filesystem with resource fork
+            // support, suppose that destination file system also is HFS[-like]
+            pathRsrcOut = file2 + wxT("/..namedfork/rsrc");
+        }
+        else // check if we have resource fork in separate file (non-HFS case)
+        {
+            wxFileName fnRsrc(file1);
+            fnRsrc.SetName(wxT("._") + fnRsrc.GetName());

 
 

-        // end of file?
-        if ( !count )
-            break;
+            fileRsrcIn.Close();
+            if ( fileRsrcIn.Open( fnRsrc.GetFullPath() ) )
+            {
+                fnRsrc = file2;
+                fnRsrc.SetName(wxT("._") + fnRsrc.GetName());

 
 

-        if ( fileOut.Write(buf, count) < count )
-            return FALSE;
+                pathRsrcOut = fnRsrc.GetFullPath();
+            }
+        }

     }
 
     }
 

-    // we can expect fileIn to be closed successfully, but we should ensure
-    // that fileOut was closed as some write errors (disk full) might not be
-    // detected before doing this
-    if ( !fileIn.Close() || !fileOut.Close() )
-        return FALSE;
+    if ( !pathRsrcOut.empty() )
+    {
+        if ( !wxDoCopyFile(fileRsrcIn, fbuf, pathRsrcOut, overwrite) )
+            return false;
+    }
+#endif // wxMac || wxCocoa

 
 #if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
     // no chmod in VA.  Should be some permission API for HPFS386 partitions
 
 #if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
     // no chmod in VA.  Should be some permission API for HPFS386 partitions


@@ -1268,30 +1177,50 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());
     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());

-        return FALSE;
+        return false;

     }
 #endif // OS/2 || Mac
     }
 #endif // OS/2 || Mac

+
+#else // !Win32 && ! wxUSE_FILE
+
+    // impossible to simulate with wxWidgets API
+    wxUnusedVar(file1);
+    wxUnusedVar(file2);
+    wxUnusedVar(overwrite);
+    return false;
+

 #endif // __WXMSW__ && __WIN32__
 
 #endif // __WXMSW__ && __WIN32__
 

-    return TRUE;
+    return true;

 }
 
 bool
 }
 
 bool

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

 {
 {

-#ifndef __WXWINCE__
+    if ( !overwrite && wxFileExists(file2) )
+    {
+        wxLogSysError
+        (
+            _("Failed to rename the file '%s' to '%s' because the destination file already exists."),
+            file1.c_str(), file2.c_str()
+        );
+
+        return false;
+    }
+
+#if !defined(__WXWINCE__) && !defined(__WXPALMOS__)

     // Normal system call
   if ( wxRename (file1, file2) == 0 )
     // Normal system call
   if ( wxRename (file1, file2) == 0 )

-    return TRUE;
+    return true;

 #endif
 
   // Try to copy
 #endif
 
   // Try to copy

-  if (wxCopyFile(file1, file2)) {
+  if (wxCopyFile(file1, file2, overwrite)) {

     wxRemoveFile(file1);
     wxRemoveFile(file1);

-    return TRUE;
+    return true;

   }
   // Give up
   }
   // Give up

-  return FALSE;
+  return false;

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


@@ -1299,33 +1228,42 @@ bool wxRemoveFile(const wxString& file)
 #if defined(__VISUALC__) \
  || defined(__BORLANDC__) \
  || defined(__WATCOMC__) \
 #if defined(__VISUALC__) \
  || defined(__BORLANDC__) \
  || defined(__WATCOMC__) \

- || defined(__GNUWIN32__)
-  int res = wxRemove(file);
+ || defined(__DMC__) \
+ || defined(__GNUWIN32__) \
+ || (defined(__MWERKS__) && defined(__MSL__))
+    int res = wxRemove(file);

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-  int res = unlink(wxFNCONV(file));
+    int res = unlink(file.fn_str());
+#elif defined(__WXPALMOS__)
+    int res = 1;
+    // TODO with VFSFileDelete()

 #else
 #else

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

 #endif
 
 #endif
 

-  return res == 0;
+    return res == 0;

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

-#if defined(__WXMAC__) && !defined(__UNIX__)
-  return (mkdir( wxFNCONV(dir) , 0 ) == 0);
+#if defined(__WXPALMOS__)
+    return false;
+#elif defined(__WXMAC__) && !defined(__UNIX__)
+    return (mkdir(dir.fn_str() , 0 ) == 0);

 #else // !Mac
     const wxChar *dirname = dir.c_str();
 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler
 #else // !Mac
     const wxChar *dirname = dir.c_str();
 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler

-#if (!(defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
-  #ifndef MSVCRT
-    if ( mkdir(wxFNCONV(dirname), perm) != 0 )
-  #else
+#if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
+  #if defined(MSVCRT)
+    wxUnusedVar(perm);

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

+  #else
+    if ( mkdir(wxFNCONV(dirname), perm) != 0 )

   #endif
   #endif

-#elif defined(__WXPM__)
+#elif defined(__OS2__)
+    wxUnusedVar(perm);

     if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
 #elif defined(__DOS__)
   #if defined(__WATCOMC__)
     if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
 #elif defined(__DOS__)
   #if defined(__WATCOMC__)


@@ -1337,49 +1275,48 @@ bool wxMkdir(const wxString& dir, int perm)
     #error "Unsupported DOS compiler!"
   #endif
 #else  // !MSW, !DOS and !OS/2 VAC++
     #error "Unsupported DOS compiler!"
   #endif
 #else  // !MSW, !DOS and !OS/2 VAC++

-    (void)perm;
+    wxUnusedVar(perm);

 #ifdef __WXWINCE__
     if ( !CreateDirectory(dirname, NULL) )
 #else
 #ifdef __WXWINCE__
     if ( !CreateDirectory(dirname, NULL) )
 #else

-    if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
+    if ( wxMkDir(dir.fn_str()) != 0 )

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

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 #endif // Mac/!Mac
 }
 
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #endif // Mac/!Mac
 }
 
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {

-#ifdef __VMS__
-    return FALSE; //to be changed since rmdir exists in VMS7.x
-#elif defined(__WXPM__)
-    return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
-#else
-
-#ifdef __WXWINCE__
-    return (CreateDirectory(dir, NULL) != 0);
+#if defined(__VMS__)
+    return false; //to be changed since rmdir exists in VMS7.x
+#elif defined(__OS2__)
+    return (::DosDeleteDir(dir.c_str()) == 0);
+#elif defined(__WXWINCE__)
+    return (RemoveDirectory(dir) != 0);
+#elif defined(__WXPALMOS__)
+    // TODO with VFSFileRename()
+    return false;

 #else
     return (wxRmDir(OS_FILENAME(dir)) == 0);
 #endif
 #else
     return (wxRmDir(OS_FILENAME(dir)) == 0);
 #endif

-
-#endif

 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)
 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)

-bool wxPathExists(const wxChar *pszPathName)
+bool wxDirExists(const wxString& pathName)

 {
 {

-    wxString strPath(pszPathName);
+    wxString strPath(pathName);

 
 

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

     // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
     // so remove all trailing backslashes from the path - but don't do this for
     // 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 "\"
+    // the paths "d:\" (which are different from "d:") nor for just "\"

     while ( wxEndsWithPathSeparator(strPath) )
     {
         size_t len = strPath.length();
     while ( wxEndsWithPathSeparator(strPath) )
     {
         size_t len = strPath.length();


@@ -1390,19 +1327,35 @@ bool wxPathExists(const wxChar *pszPathName)
     }
 #endif // __WINDOWS__
 
     }
 #endif // __WINDOWS__
 

-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+#ifdef __OS2__
+    // OS/2 can't handle "d:", it wants either "d:\" or "d:."
+    if (strPath.length() == 2 && strPath[1u] == _T(':'))
+        strPath << _T('.');
+#endif
+
+#if defined(__WXPALMOS__)
+    return false;
+#elif defined(__WIN32__) && !defined(__WXMICROWIN__)

     // stat() can't cope with network paths
     // stat() can't cope with network paths

-    DWORD ret = ::GetFileAttributes(strPath);
+    DWORD ret = ::GetFileAttributes(strPath.fn_str());

 
     return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
 
     return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);

+#elif defined(__OS2__)
+    FILESTATUS3 Info = {{0}};
+    APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,
+                                   (void*) &Info, sizeof(FILESTATUS3));
+
+    return ((rc == NO_ERROR) && (Info.attrFile & FILE_DIRECTORY)) ||
+      (rc == ERROR_SHARING_VIOLATION);
+    // If we got a sharing violation, there must be something with this name.

 #else // !__WIN32__
 
     wxStructStat st;
 #ifndef __VISAGECPP__
 #else // !__WIN32__
 
     wxStructStat st;
 #ifndef __VISAGECPP__

-    return wxStat(pszPathName, &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR);
+    return wxStat(strPath.c_str(), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR);

 #else
     // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only
 #else
     // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only

-    return wxStat(pszPathName, &st) == 0 && (st.st_mode == S_IFDIR);
+    return wxStat(strPath.c_str(), &st) == 0 && (st.st_mode == S_IFDIR);

 #endif
 
 #endif // __WIN32__/!__WIN32__
 #endif
 
 #endif // __WIN32__/!__WIN32__


@@ -1411,12 +1364,17 @@ bool wxPathExists(const wxChar *pszPathName)
 // 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)
 {

-    wxString filename = wxFileName::CreateTempFileName(prefix);
-    if ( filename.empty() )
+    wxString filename;
+    if ( !wxGetTempFileName(prefix, filename) )

         return NULL;
 
     if ( buf )
         return NULL;
 
     if ( buf )

+#ifdef _PACC_VER
+        // work around the PalmOS pacc compiler bug
+        wxStrcpy(buf, filename.data());
+#else

         wxStrcpy(buf, filename);
         wxStrcpy(buf, filename);

+#endif

     else
         buf = MYcopystring(filename);
 
     else
         buf = MYcopystring(filename);
 


@@ -1425,9 +1383,16 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
 
 bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 {
 
 bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 {

+#if wxUSE_FILE

     buf = wxFileName::CreateTempFileName(prefix);
 
     return !buf.empty();
     buf = wxFileName::CreateTempFileName(prefix);
 
     return !buf.empty();

+#else // !wxUSE_FILE
+    wxUnusedVar(prefix);
+    wxUnusedVar(buf);
+
+    return false;
+#endif // wxUSE_FILE/!wxUSE_FILE

 }
 
 // Get first file name matching given wild card.
 }
 
 // Get first file name matching given wild card.


@@ -1435,16 +1400,15 @@ bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 static wxDir *gs_dir = NULL;
 static wxString gs_dirPath;
 
 static wxDir *gs_dir = NULL;
 static wxString gs_dirPath;
 

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

 {
     wxSplitPath(spec, &gs_dirPath, NULL, NULL);
 {
     wxSplitPath(spec, &gs_dirPath, NULL, NULL);

-    if ( gs_dirPath.IsEmpty() )
+    if ( gs_dirPath.empty() )

         gs_dirPath = wxT(".");
     if ( !wxEndsWithPathSeparator(gs_dirPath ) )
         gs_dirPath << wxFILE_SEP_PATH;
 
         gs_dirPath = wxT(".");
     if ( !wxEndsWithPathSeparator(gs_dirPath ) )
         gs_dirPath << wxFILE_SEP_PATH;
 

-    if (gs_dir)
-        delete gs_dir;
+    delete gs_dir; // can be NULL, this is ok

     gs_dir = new wxDir(gs_dirPath);
 
     if ( !gs_dir->IsOpened() )
     gs_dir = new wxDir(gs_dirPath);
 
     if ( !gs_dir->IsOpened() )


@@ -1462,8 +1426,8 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     }
 
     wxString result;
     }
 
     wxString result;

-    gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);
-    if ( result.IsEmpty() )
+    gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags);
+    if ( result.empty() )

     {
         wxDELETE(gs_dir);
         return result;
     {
         wxDELETE(gs_dir);
         return result;


@@ -1474,12 +1438,12 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
 
 wxString wxFindNextFile()
 {
 
 wxString wxFindNextFile()
 {

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

 
     wxString result;
     gs_dir->GetNext(&result);
 
 
     wxString result;
     gs_dir->GetNext(&result);
 

-    if ( result.IsEmpty() )
+    if ( result.empty() )

     {
         wxDELETE(gs_dir);
         return result;
     {
         wxDELETE(gs_dir);
         return result;


@@ -1490,44 +1454,50 @@ wxString wxFindNextFile()
 
 
 // Get current working directory.
 
 
 // Get current working directory.

-// If buf is NULL, allocates space using new, else
-// copies into buf.
-wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
+// If buf is NULL, allocates space using new, else copies into buf.
+// wxGetWorkingDirectory() is obsolete, use wxGetCwd()
+// wxDoGetCwd() is their common core to be moved
+// to wxGetCwd() once wxGetWorkingDirectory() will be removed.
+// Do not expose wxDoGetCwd in headers!
+
+wxChar *wxDoGetCwd(wxChar *buf, int sz)

 {
 {

-#ifdef __WXWINCE__
-    return NULL;
+#if defined(__WXPALMOS__)
+    // TODO
+    if(buf && sz>0) buf[0] = _T('\0');
+    return buf;
+#elif defined(__WXWINCE__)
+    // TODO
+    if(buf && sz>0) buf[0] = _T('\0');
+    return buf;

 #else
     if ( !buf )
     {
         buf = new wxChar[sz + 1];
     }
 
 #else
     if ( !buf )
     {
         buf = new wxChar[sz + 1];
     }
 

-    bool ok wxDUMMY_INITIALIZE(FALSE);
+    bool ok wxDUMMY_INITIALIZE(false);

 
     // for the compilers which have Unicode version of _getcwd(), call it
     // directly, for the others call the ANSI version and do the translation
 #if !wxUSE_UNICODE
     #define cbuf buf
 #else // wxUSE_UNICODE
 
     // for the compilers which have Unicode version of _getcwd(), call it
     // directly, for the others call the ANSI version and do the translation
 #if !wxUSE_UNICODE
     #define cbuf buf
 #else // wxUSE_UNICODE

-    bool needsANSI = TRUE;
+    bool needsANSI = true;

 
     #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
 
     #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU

-        // This is not legal code as the compiler
-        // is allowed destroy the wxCharBuffer.
-        // wxCharBuffer c_buffer(sz);
-        // char *cbuf = (char*)(const char*)c_buffer;

         char cbuf[_MAXPATHLEN];
     #endif
 
     #ifdef HAVE_WGETCWD
         #if wxUSE_UNICODE_MSLU
         char cbuf[_MAXPATHLEN];
     #endif
 
     #ifdef HAVE_WGETCWD
         #if wxUSE_UNICODE_MSLU

-            if ( wxGetOsVersion() != wxWIN95 )
+            if ( wxGetOsVersion() != wxOS_WINDOWS_9X )

         #else
         #else

-            char *cbuf = NULL; // never really used because needsANSI will always be FALSE
+            char *cbuf = NULL; // never really used because needsANSI will always be false

         #endif
             {
                 ok = _wgetcwd(buf, sz) != NULL;
         #endif
             {
                 ok = _wgetcwd(buf, sz) != NULL;

-                needsANSI = FALSE;
+                needsANSI = false;

             }
     #endif
 
             }
     #endif
 


@@ -1536,41 +1506,29 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
     {
     #if defined(_MSC_VER) || defined(__MINGW32__)
         ok = _getcwd(cbuf, sz) != NULL;
     {
     #if defined(_MSC_VER) || defined(__MINGW32__)
         ok = _getcwd(cbuf, sz) != NULL;

-    #elif defined(__WXMAC__) && !defined(__DARWIN__)
-        FSSpec cwdSpec ;
-        FCBPBRec pb;
-        OSErr error;
-        Str255  fileName ;
-        pb.ioNamePtr = (StringPtr) &fileName;
-        pb.ioVRefNum = 0;
-        pb.ioRefNum = LMGetCurApRefNum();
-        pb.ioFCBIndx = 0;
-        error = PBGetFCBInfoSync(&pb);
-        if ( error == noErr )
-        {
-            cwdSpec.vRefNum = pb.ioFCBVRefNum;
-            cwdSpec.parID = pb.ioFCBParID;
-            cwdSpec.name[0] = 0 ;
-            wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
-                       wxStrcpy( buf , res ) ;                 
-            ok = TRUE;
-        }
-        else
+    #elif defined(__OS2__)
+        APIRET rc;
+        ULONG ulDriveNum = 0;
+        ULONG ulDriveMap = 0;
+        rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
+        ok = rc == 0;
+        if (ok)

         {
         {

-            ok = FALSE;
+            sz -= 3;
+            rc = ::DosQueryCurrentDir( 0 // current drive
+                                      ,cbuf + 3
+                                      ,(PULONG)&sz
+                                     );
+            cbuf[0] = char('A' + (ulDriveNum - 1));
+            cbuf[1] = ':';
+            cbuf[2] = '\\';
+            ok = rc == 0;

         }
         }

-    #elif defined(__VISAGECPP__) || (defined (__OS2__) && defined (__WATCOMC__))
-        APIRET rc;
-        rc = ::DosQueryCurrentDir( 0 // current drive
-                                  ,cbuf
-                                  ,(PULONG)&sz
-                                 );
-        ok = rc != 0;

     #else // !Win32/VC++ !Mac !OS2
         ok = getcwd(cbuf, sz) != NULL;
     #endif // platform
 
     #else // !Win32/VC++ !Mac !OS2
         ok = getcwd(cbuf, sz) != NULL;
     #endif // platform
 

-    #if wxUSE_UNICODE && !defined(__WXMAC__)
+    #if wxUSE_UNICODE

         // finally convert the result to Unicode if needed
         wxConvFile.MB2WC(buf, cbuf, sz);
     #endif // wxUSE_UNICODE
         // finally convert the result to Unicode if needed
         wxConvFile.MB2WC(buf, cbuf, sz);
     #endif // wxUSE_UNICODE


@@ -1603,7 +1561,13 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
 #if defined( __CYGWIN__ ) && defined( __WINDOWS__ )
         // another example of DOS/Unix mix (Cygwin)
         wxString pathUnix = buf;
 #if defined( __CYGWIN__ ) && defined( __WINDOWS__ )
         // another example of DOS/Unix mix (Cygwin)
         wxString pathUnix = buf;

+#if wxUSE_UNICODE
+        char bufA[_MAXPATHLEN];
+        cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA);
+        wxConvFile.MB2WC(buf, bufA, sz);
+#else

         cygwin_conv_to_full_win32_path(pathUnix, buf);
         cygwin_conv_to_full_win32_path(pathUnix, buf);

+#endif // wxUSE_UNICODE

 #endif // __CYGWIN__
     }
 
 #endif // __CYGWIN__
     }
 


@@ -1617,30 +1581,43 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
     // __WXWINCE__
 }
 
     // __WXWINCE__
 }
 

-wxString wxGetCwd()
+#if WXWIN_COMPATIBILITY_2_6
+wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)

 {
 {

-    wxChar *buffer = new wxChar[_MAXPATHLEN];
-    wxGetWorkingDirectory(buffer, _MAXPATHLEN);
-    wxString str( buffer );
-    delete [] buffer;
+    return wxDoGetCwd(buf,sz);
+}
+#endif // WXWIN_COMPATIBILITY_2_6

 
 

+wxString wxGetCwd()
+{
+    wxString str;
+    wxDoGetCwd(wxStringBuffer(str, _MAXPATHLEN), _MAXPATHLEN);

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

-#if defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
+#if defined(__OS2__)
+    if (d[1] == ':')
+    {
+        ::DosSetDefaultDisk(wxToupper(d[0]) - _T('A') + 1);
+    // do not call DosSetCurrentDir when just changing drive,
+    // since it requires e.g. "d:." instead of "d:"!
+    if (d.length() == 2)
+        return true;
+    }
+    return (::DosSetCurrentDir(d.c_str()) == 0);
+#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)

     return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
     return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);

-#elif defined(__WXPM__)
-    return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);

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

-    
+

 #ifdef __WIN32__
 #ifdef __WXWINCE__
     // No equivalent in WinCE
 #ifdef __WIN32__
 #ifdef __WXWINCE__
     // No equivalent in WinCE

-    return FALSE;
+    wxUnusedVar(d);
+    return false;

 #else
 #else

-    return (bool)(SetCurrentDirectory(d) != 0);
+    return (bool)(SetCurrentDirectory(d.fn_str()) != 0);

 #endif
 #else
     // Must change drive, too.
 #endif
 #else
     // Must change drive, too.


@@ -1648,11 +1625,11 @@ bool wxSetWorkingDirectory(const wxString& d)
     if (isDriveSpec)
     {
         wxChar firstChar = d[0];
     if (isDriveSpec)
     {
         wxChar firstChar = d[0];

-        
+

         // To upper case
         if (firstChar > 90)
             firstChar = firstChar - 32;
         // To upper case
         if (firstChar > 90)
             firstChar = firstChar - 32;

-        
+

         // To a drive number
         unsigned int driveNo = firstChar - 64;
         if (driveNo > 0)
         // To a drive number
         unsigned int driveNo = firstChar - 64;
         if (driveNo > 0)


@@ -1662,10 +1639,10 @@ bool wxSetWorkingDirectory(const wxString& d)
         }
     }
     bool success = (chdir(WXSTRINGCAST d) == 0);
         }
     }
     bool success = (chdir(WXSTRINGCAST d) == 0);

-    
+

     return success;
 #endif
     return success;
 #endif

-    
+

 #endif
 }
 
 #endif
 }
 


@@ -1679,112 +1656,327 @@ wxString wxGetOSDirectory()
     wxChar buf[256];
     GetWindowsDirectory(buf, 256);
     return wxString(buf);
     wxChar buf[256];
     GetWindowsDirectory(buf, 256);
     return wxString(buf);

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && wxOSX_USE_CARBON

     return wxMacFindFolder(kOnSystemDisk, 'macs', false);
 #else
     return wxEmptyString;
 #endif
 }
 
     return wxMacFindFolder(kOnSystemDisk, 'macs', false);
 #else
     return wxEmptyString;
 #endif
 }
 

-bool wxEndsWithPathSeparator(const wxChar *pszFileName)
+bool wxEndsWithPathSeparator(const wxString& filename)

 {
 {

-    size_t len = wxStrlen(pszFileName);
-
-    return len && wxIsPathSeparator(pszFileName[len - 1]);
+    return !filename.empty() && wxIsPathSeparator(filename.Last());

 }
 
 }
 

-// 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 wxString& szPath, const wxString& szFile)

 {
     // we assume that it's not empty
 {
     // we assume that it's not empty

-    wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE,
+    wxCHECK_MSG( !szFile.empty(), false,

                  _T("empty file name in wxFindFileInPath"));
 
     // skip path separator in the beginning of the file name if present
                  _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) )
+    wxString szFile2;
+    if ( wxIsPathSeparator(szFile[0u]) )
+        szFile2 = szFile.Mid(1);
+    else
+        szFile2 = szFile;
+
+    wxStringTokenizer tkn(szPath, wxPATH_SEP);
+
+    while ( tkn.HasMoreTokens() )

     {
     {

-        // search for the file in this directory
-        strFile = pc;
-        if ( !wxEndsWithPathSeparator(pc) )
+        wxString strFile = tkn.GetNextToken();
+        if ( !wxEndsWithPathSeparator(strFile) )

             strFile += wxFILE_SEP_PATH;
             strFile += wxFILE_SEP_PATH;

-        strFile += pszFile;
+        strFile += szFile2;

 
 

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

             *pStr = strFile;
             *pStr = strFile;

-            break;
+            return true;

         }
     }
 
         }
     }
 

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

 }
 
 }
 

-void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
+void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,

                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt)
 {
                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt)
 {

-    // it can be empty, but it shouldn't be NULL
-    wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );
+    wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
+}
+
+#if wxUSE_DATETIME
+
+time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)
+{
+    wxDateTime mtime;
+    if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
+        return (time_t)-1;

 
 

-    wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt);
+    return mtime.GetTicks();

 }
 
 }
 

-time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+#endif // wxUSE_DATETIME
+
+
+// Parses the filterStr, returning the number of filters.
+// Returns 0 if none or if there's a problem.
+// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"
+
+int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
+                                           wxArrayString& descriptions,
+                                           wxArrayString& filters)

 {
 {

-#ifdef __WXWINCE__
-    FILETIME creationTime, lastAccessTime, lastWriteTime;
-    HANDLE fileHandle = ::CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
-        0, FILE_ATTRIBUTE_NORMAL, 0);
-    if (fileHandle == INVALID_HANDLE_VALUE)
-        return 0;
-    else
+    descriptions.Clear();
+    filters.Clear();
+
+    wxString str(filterStr);
+
+    wxString description, filter;
+    int pos = 0;
+    while( pos != wxNOT_FOUND )

     {
     {

-        if (GetFileTime(fileHandle, & creationTime, & lastAccessTime, & lastWriteTime))
+        pos = str.Find(wxT('|'));
+        if ( pos == wxNOT_FOUND )

         {
         {

-            CloseHandle(fileHandle);
-
-            wxDateTime dateTime;
-            FILETIME ftLocal;
-            if ( !::FileTimeToLocalFileTime(&lastWriteTime, &ftLocal) )
+            // if there are no '|'s at all in the string just take the entire
+            // string as filter and make description empty for later autocompletion
+            if ( filters.IsEmpty() )

             {
             {

-                wxLogLastError(_T("FileTimeToLocalFileTime"));
+                descriptions.Add(wxEmptyString);
+                filters.Add(filterStr);

             }
             }

-            
-            SYSTEMTIME st;
-            if ( !::FileTimeToSystemTime(&ftLocal, &st) )
+            else

             {
             {

-                wxLogLastError(_T("FileTimeToSystemTime"));
+                wxFAIL_MSG( _T("missing '|' in the wildcard string!") );

             }
             }

-            
-            dateTime.Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear,
-                st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
-            return dateTime.GetTicks();
+
+            break;
+        }
+
+        description = str.Left(pos);
+        str = str.Mid(pos + 1);
+        pos = str.Find(wxT('|'));
+        if ( pos == wxNOT_FOUND )
+        {
+            filter = str;

         }
         else
         }
         else

-            return 0;
+        {
+            filter = str.Left(pos);
+            str = str.Mid(pos + 1);
+        }
+
+        descriptions.Add(description);
+        filters.Add(filter);

     }
     }

+
+#if defined(__WXMOTIF__)
+    // split it so there is one wildcard per entry
+    for( size_t i = 0 ; i < descriptions.GetCount() ; i++ )
+    {
+        pos = filters[i].Find(wxT(';'));
+        if (pos != wxNOT_FOUND)
+        {
+            // first split only filters
+            descriptions.Insert(descriptions[i],i+1);
+            filters.Insert(filters[i].Mid(pos+1),i+1);
+            filters[i]=filters[i].Left(pos);
+
+            // autoreplace new filter in description with pattern:
+            //     C/C++ Files(*.cpp;*.c;*.h)|*.cpp;*.c;*.h
+            // cause split into:
+            //     C/C++ Files(*.cpp)|*.cpp
+            //     C/C++ Files(*.c;*.h)|*.c;*.h
+            // and next iteration cause another split into:
+            //     C/C++ Files(*.cpp)|*.cpp
+            //     C/C++ Files(*.c)|*.c
+            //     C/C++ Files(*.h)|*.h
+            for ( size_t k=i;k<i+2;k++ )
+            {
+                pos = descriptions[k].Find(filters[k]);
+                if (pos != wxNOT_FOUND)
+                {
+                    wxString before = descriptions[k].Left(pos);
+                    wxString after = descriptions[k].Mid(pos+filters[k].Len());
+                    pos = before.Find(_T('('),true);
+                    if (pos>before.Find(_T(')'),true))
+                    {
+                        before = before.Left(pos+1);
+                        before << filters[k];
+                        pos = after.Find(_T(')'));
+                        int pos1 = after.Find(_T('('));
+                        if (pos != wxNOT_FOUND && (pos<pos1 || pos1==wxNOT_FOUND))
+                        {
+                            before << after.Mid(pos);
+                            descriptions[k] = before;
+                        }
+                    }
+                }
+            }
+        }
+    }
+#endif
+
+    // autocompletion
+    for( size_t j = 0 ; j < descriptions.GetCount() ; j++ )
+    {
+        if ( descriptions[j].empty() && !filters[j].empty() )
+        {
+            descriptions[j].Printf(_("Files (%s)"), filters[j].c_str());
+        }
+    }
+
+    return filters.GetCount();
+}
+
+#if defined(__WINDOWS__) && !(defined(__UNIX__) || defined(__OS2__))
+static bool wxCheckWin32Permission(const wxString& path, DWORD access)
+{
+    // quoting the MSDN: "To obtain a handle to a directory, call the
+    // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
+    // doesn't work under Win9x/ME but then it's not needed there anyhow
+    bool isdir = wxDirExists(path);
+    if ( isdir && wxGetOsVersion() == wxOS_WINDOWS_9X )
+    {
+        // FAT directories always allow all access, even if they have the
+        // readonly flag set
+        return true;
+    }
+
+    HANDLE h = ::CreateFile
+                 (
+                    path.t_str(),
+                    access,
+                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                    NULL,
+                    OPEN_EXISTING,
+                    isdir ? FILE_FLAG_BACKUP_SEMANTICS : 0,
+                    NULL
+                 );
+    if ( h != INVALID_HANDLE_VALUE )
+        CloseHandle(h);
+
+    return h != INVALID_HANDLE_VALUE;
+}
+#endif // __WINDOWS__
+
+bool wxIsWritable(const wxString &path)
+{
+#if defined( __UNIX__ ) || defined(__OS2__)
+    // access() will take in count also symbolic links
+    return wxAccess(path.c_str(), W_OK) == 0;
+#elif defined( __WINDOWS__ )
+    return wxCheckWin32Permission(path, GENERIC_WRITE);

 #else
 #else

-    wxStructStat buf;
-    wxStat( filename, &buf);
+    wxUnusedVar(path);
+    // TODO
+    return false;
+#endif
+}

 
 

-    return buf.st_mtime;
+bool wxIsReadable(const wxString &path)
+{
+#if defined( __UNIX__ ) || defined(__OS2__)
+    // access() will take in count also symbolic links
+    return wxAccess(path.c_str(), R_OK) == 0;
+#elif defined( __WINDOWS__ )
+    return wxCheckWin32Permission(path, GENERIC_READ);
+#else
+    wxUnusedVar(path);
+    // TODO
+    return false;
+#endif
+}
+
+bool wxIsExecutable(const wxString &path)
+{
+#if defined( __UNIX__ ) || defined(__OS2__)
+    // access() will take in count also symbolic links
+    return wxAccess(path.c_str(), X_OK) == 0;
+#elif defined( __WINDOWS__ )
+   return wxCheckWin32Permission(path, GENERIC_EXECUTE);
+#else
+    wxUnusedVar(path);
+    // TODO
+    return false;
+#endif
+}
+
+// Return the type of an open file
+//
+// Some file types on some platforms seem seekable but in fact are not.
+// The main use of this function is to allow such cases to be detected
+// (IsSeekable() is implemented as wxGetFileKind() == wxFILE_KIND_DISK).
+//
+// This is important for the archive streams, which benefit greatly from
+// being able to seek on a stream, but which will produce corrupt archives
+// if they unknowingly seek on a non-seekable stream.
+//
+// wxFILE_KIND_DISK is a good catch all return value, since other values
+// disable features of the archive streams. Some other value must be returned
+// for a file type that appears seekable but isn't.
+//
+// Known examples:
+//   *  Pipes on Windows
+//   *  Files on VMS with a record format other than StreamLF
+//
+wxFileKind wxGetFileKind(int fd)
+{
+#if defined __WXMSW__ && !defined __WXWINCE__ && defined wxGetOSFHandle
+    switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE)
+    {
+        case FILE_TYPE_CHAR:
+            return wxFILE_KIND_TERMINAL;
+        case FILE_TYPE_DISK:
+            return wxFILE_KIND_DISK;
+        case FILE_TYPE_PIPE:
+            return wxFILE_KIND_PIPE;
+    }
+
+    return wxFILE_KIND_UNKNOWN;
+
+#elif defined(__UNIX__)
+    if (isatty(fd))
+        return wxFILE_KIND_TERMINAL;
+
+    struct stat st;
+    fstat(fd, &st);
+
+    if (S_ISFIFO(st.st_mode))
+        return wxFILE_KIND_PIPE;
+    if (!S_ISREG(st.st_mode))
+        return wxFILE_KIND_UNKNOWN;
+
+    #if defined(__VMS__)
+        if (st.st_fab_rfm != FAB$C_STMLF)
+            return wxFILE_KIND_UNKNOWN;
+    #endif
+
+    return wxFILE_KIND_DISK;
+
+#else
+    #define wxFILEKIND_STUB
+    (void)fd;
+    return wxFILE_KIND_DISK;
+#endif
+}
+
+wxFileKind wxGetFileKind(FILE *fp)
+{
+    // Note: The watcom rtl dll doesn't have fileno (the static lib does).
+    //       Should be fixed in version 1.4.
+#if defined(wxFILEKIND_STUB) || wxONLY_WATCOM_EARLIER_THAN(1,4)
+    (void)fp;
+    return wxFILE_KIND_DISK;
+#elif defined(__WINDOWS__) && !defined(__CYGWIN__) && !defined(__WATCOMC__) && !defined(__WINE__)
+    return fp ? wxGetFileKind(_fileno(fp)) : wxFILE_KIND_UNKNOWN;
+#else
+    return fp ? wxGetFileKind(fileno(fp)) : wxFILE_KIND_UNKNOWN;

 #endif
 }
 
 #endif
 }
 


@@ -1795,150 +1987,133 @@ time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
 
 bool wxIsWild( const wxString& pattern )
 {
 
 bool wxIsWild( const wxString& pattern )
 {

-    wxString tmp = pattern;
-    wxChar *pat = WXSTRINGCAST(tmp);
-    while (*pat)
+    for ( wxString::const_iterator p = pattern.begin(); p != pattern.end(); ++p )

     {
     {

-        switch (*pat++)
+        switch ( (*p).GetValue() )

         {
         {

-        case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
-            return TRUE;
-        case wxT('\\'):
-            if (!*pat++)
-                return FALSE;
+            case wxT('?'):
+            case wxT('*'):
+            case wxT('['):
+            case wxT('{'):
+                return true;
+
+            case wxT('\\'):
+                if ( ++p == pattern.end() )
+                    return false;

         }
     }
         }
     }

-    return FALSE;
+    return false;

 }
 
 /*
 * Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
 *
 * The match procedure is public domain code (from ircII's reg.c)
 }
 
 /*
 * Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
 *
 * The match procedure is public domain code (from ircII's reg.c)

+* but modified to suit our tastes (RN: No "%" syntax I guess)

 */
 
 bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
 {
 */
 
 bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
 {

-        if (text.empty())
+    if (text.empty())
+    {
+        /* Match if both are empty. */
+        return pat.empty();
+    }
+
+    const wxChar *m = pat.c_str(),
+    *n = text.c_str(),
+    *ma = NULL,
+    *na = NULL;
+    int just = 0,
+    acount = 0,
+    count = 0;
+
+    if (dot_special && (*n == wxT('.')))
+    {
+        /* Never match so that hidden Unix files
+         * are never found. */
+        return false;
+    }
+
+    for (;;)
+    {
+        if (*m == wxT('*'))

         {
         {

-                /* Match if both are empty. */
-                return pat.empty();
+            ma = ++m;
+            na = n;
+            just = 1;
+            acount = count;

         }
         }

-
-        const wxChar *m = pat.c_str(),
-        *n = text.c_str(),
-        *ma = NULL,
-        *na = NULL,
-        *mp = NULL,
-        *np = NULL;
-        int just = 0,
-        pcount = 0,
-        acount = 0,
-        count = 0;
-
-        if (dot_special && (*n == wxT('.')))
+        else if (*m == wxT('?'))

         {
         {

-                /* Never match so that hidden Unix files
-                 * are never found. */
-                return FALSE;
+            m++;
+            if (!*n++)
+                return false;

         }
         }

-
-        for (;;)
+        else

         {
         {

-                if (*m == wxT('*'))
-                {
-                        ma = ++m;
-                        na = n;
-                        just = 1;
-                        mp = NULL;
-                        acount = count;
-                }
-                else if (*m == wxT('?'))
+            if (*m == wxT('\\'))
+            {
+                m++;
+                /* Quoting "nothing" is a bad thing */
+                if (!*m)
+                    return false;
+            }
+            if (!*m)
+            {
+                /*
+                * If we are out of both strings or we just
+                * saw a wildcard, then we can say we have a
+                * match
+                */
+                if (!*n)
+                    return true;
+                if (just)
+                    return true;
+                just = 0;
+                goto not_matched;
+            }
+            /*
+            * We could check for *n == NULL at this point, but
+            * since it's more common to have a character there,
+            * check to see if they match first (m and n) and
+            * then if they don't match, THEN we can check for
+            * the NULL of n
+            */
+            just = 0;
+            if (*m == *n)
+            {
+                m++;
+                count++;
+                n++;
+            }
+            else
+            {
+
+                not_matched:
+
+                /*
+                * If there are no more characters in the
+                * string, but we still need to find another
+                * character (*m != NULL), then it will be
+                * impossible to match it
+                */
+                if (!*n)
+                    return false;
+
+                if (ma)

                 {
                 {

-                        m++;
-                        if (!*n++)
-                        return FALSE;
+                    m = ma;
+                    n = ++na;
+                    count = acount;

                 }
                 else
                 }
                 else

-                {
-                        if (*m == wxT('\\'))
-                        {
-                                m++;
-                                /* Quoting "nothing" is a bad thing */
-                                if (!*m)
-                                return FALSE;
-                        }
-                        if (!*m)
-                        {
-                                /*
-                                * If we are out of both strings or we just
-                                * saw a wildcard, then we can say we have a
-                                * match
-                                */
-                                if (!*n)
-                                return TRUE;
-                                if (just)
-                                return TRUE;
-                                just = 0;
-                                goto not_matched;
-                        }
-                        /*
-                        * We could check for *n == NULL at this point, but
-                        * since it's more common to have a character there,
-                        * check to see if they match first (m and n) and
-                        * then if they don't match, THEN we can check for
-                        * the NULL of n
-                        */
-                        just = 0;
-                        if (*m == *n)
-                        {
-                                m++;
-                                if (*n == wxT(' '))
-                                mp = NULL;
-                                count++;
-                                n++;
-                        }
-                        else
-                        {
-
-                                not_matched:
-
-                                /*
-                                * If there are no more characters in the
-                                * string, but we still need to find another
-                                * character (*m != NULL), then it will be
-                                * impossible to match it
-                                */
-                                if (!*n)
-                                return FALSE;
-                                if (mp)
-                                {
-                                        m = mp;
-                                        if (*np == wxT(' '))
-                                        {
-                                                mp = NULL;
-                                                goto check_percent;
-                                        }
-                                        n = ++np;
-                                        count = pcount;
-                                }
-                                else
-                                check_percent:
-
-                                if (ma)
-                                {
-                                        m = ma;
-                                        n = ++na;
-                                        count = acount;
-                                }
-                                else
-                                return FALSE;
-                        }
-                }
+                    return false;
+            }

         }
         }

+    }

 }
 
 }
 

-

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