fixed wxMBConv_iconv::GetMBNul()

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 0df53ba15806e471152452e80f1854feddfd7b87..5168a4cff508cfba6f64fd00f5d5d2e472a3a8e6 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,10 +17,6 @@
 // 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"
 #include "wx/defs.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 #include "wx/defs.h"


@@ -31,7 +27,7 @@
 
 #include "wx/utils.h"
 #include "wx/intl.h"
 
 #include "wx/utils.h"
 #include "wx/intl.h"

-#include "wx/file.h"
+#include "wx/file.h" // This does include filefn.h

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


@@ -44,102 +40,22 @@
 #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 __OS2__
-// need to check for __OS2__ first since currently both
-// __OS2__ and __UNIX__ are defined.
-    #include <process.h>
-    #include "wx/os2/private.h"
-#ifdef __EMX__
-    #include <unistd.h>
-#endif
-#elif defined(__UNIX__)
-    #include <unistd.h>
-    #include <dirent.h>
-    #include <fcntl.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>
+    #include  "wx/mac/private.h"  // includes mac headers

 #endif
 
 #include "wx/log.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"
-#endif
-

 #ifdef __WINDOWS__
 #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>


@@ -148,8 +64,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


@@ -164,14 +90,7 @@
 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

-#  ifdef __DARWIN__

 #    include "MoreFilesX.h"
 #    include "MoreFilesX.h"

-#  else
-#    include "MoreFiles.h"
-#    include "MoreFilesExtras.h"
-#    include "FullPath.h"
-#    include "FSpCompat.h"
-#  endif

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


@@ -186,7 +105,7 @@ 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
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -244,7 +163,7 @@ void wxPathList::Add (const wxString& path)
 }
 
 // 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__


@@ -255,14 +174,14 @@ void wxPathList::AddEnvList (const wxString& envVariable)
         path such as "C:\Program Files" would be split into 2 paths:
         "C:\Program" and "Files"
         */
         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)
+//        wxT(" ;"); // Don't separate with colon in DOS (used for drive)
+        wxT(";"); // Don't separate with colon in DOS (used for drive)

 #else
         wxT(" :;");
 #endif
 
 #else
         wxT(" :;");
 #endif
 

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

     {
         wxChar *s = MYcopystring (val);
         wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
     {
         wxChar *s = MYcopystring (val);
         wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);


@@ -286,7 +205,7 @@ void wxPathList::AddEnvList (const wxString& envVariable)
 
         delete [] s;
     }
 
         delete [] s;
     }

-#endif
+#endif // !__WXWINCE__

 }
 
 // Given a full filename (with path), ensure that that file can
 }
 
 // Given a full filename (with path), ensure that that file can


@@ -295,7 +214,7 @@ void wxPathList::AddEnvList (const wxString& envVariable)
 void wxPathList::EnsureFileAccessible (const wxString& path)
 {
     wxString path_only(wxPathOnly(path));
 void wxPathList::EnsureFileAccessible (const wxString& path)
 {
     wxString path_only(wxPathOnly(path));

-    if ( !path_only.IsEmpty() )
+    if ( !path_only.empty() )

     {
         if ( !Member(path_only) )
             Add(path_only);
     {
         if ( !Member(path_only) )
             Add(path_only);


@@ -308,7 +227,7 @@ bool wxPathList::Member (const wxString& path)
   {
       wxString path2( node->GetData() );
       if (
   {
       wxString path2( node->GetData() );
       if (

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

       // Case INDEPENDENT
           path.CompareTo (path2, wxString::ignoreCase) == 0
 #else
       // Case INDEPENDENT
           path.CompareTo (path2, wxString::ignoreCase) == 0
 #else


@@ -316,15 +235,14 @@ bool wxPathList::Member (const wxString& path)
           path.CompareTo (path2) == 0
 #endif
         )
           path.CompareTo (path2) == 0
 #endif
         )

-        return TRUE;
+        return true;

   }
   }

-  return FALSE;
+  return false;

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

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

 
   wxChar buf[_MAXPATHLEN];
   wxStrcpy(buf, wxFileFunctionsBuffer);
 
   wxChar buf[_MAXPATHLEN];
   wxStrcpy(buf, wxFileFunctionsBuffer);


@@ -333,7 +251,7 @@ wxString wxPathList::FindValidPath (const wxString& file)
 
   for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
     {
 
   for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
     {

-      const wxChar *path = node->GetData();
+      const wxString path(node->GetData());

       wxStrcpy (wxFileFunctionsBuffer, path);
       wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
       if (ch != wxT('\\') && ch != wxT('/'))
       wxStrcpy (wxFileFunctionsBuffer, path);
       wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
       if (ch != wxT('\\') && ch != wxT('/'))


@@ -354,11 +272,10 @@ wxString wxPathList::FindValidPath (const wxString& file)
 wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
 {
     wxString f = FindValidPath(file);
 wxString wxPathList::FindAbsoluteValidPath (const wxString& 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) )
     {


@@ -372,22 +289,33 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
 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);
 
     return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
 #else // !__WIN32__
     wxStructStat st;
     DWORD ret = ::GetFileAttributes(filename);
 
     return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
 #else // !__WIN32__
     wxStructStat st;

-    return wxStat(filename, &st) == 0 && (st.st_mode & S_IFREG);
+#ifndef wxNEED_WX_UNISTD_H
+    return (wxStat( filename.fn_str() , &st) == 0 && (st.st_mode & S_IFREG))
+#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 && (st.st_mode & S_IFREG);
+#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
     {
 #if defined(__WXMAC__) && !defined(__DARWIN__)
         // Classic or Carbon CodeWarrior like


@@ -397,23 +325,23 @@ wxIsAbsolutePath (const wxString& filename)
         // "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] != ':')
         // "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 ;
+            return true ;

 #else
         // Unix like or Windows
         if (filename[0] == wxT('/'))
 #else
         // Unix like or Windows
         if (filename[0] == wxT('/'))

-            return TRUE;
+            return true;

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

-            return TRUE;
+            return true;

 #endif
 #if defined(__WINDOWS__) || defined(__OS2__)
         // MSDOS like
         if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
 #endif
 #if defined(__WINDOWS__) || defined(__OS2__)
         // MSDOS like
         if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))

-            return TRUE;
+            return true;

 #endif
     }
 #endif
     }

-    return FALSE ;
+    return false ;

 }
 
 /*
 }
 
 /*


@@ -424,32 +352,31 @@ wxIsAbsolutePath (const wxString& filename)
 
 void wxStripExtension(wxChar *buffer)
 {
 
 void wxStripExtension(wxChar *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(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


@@ -508,28 +435,38 @@ wxChar *wxRealPath (wxChar *path)
   return path;
 }
 
   return 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 );

 }
 
 /*-
 }
 
 /*-


@@ -571,9 +508,9 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
     trimchars[3] = 0;
 
 #ifdef __WXMSW__
     trimchars[3] = 0;
 
 #ifdef __WXMSW__

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

 #else
 #else

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

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


@@ -618,7 +555,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


@@ -667,7 +604,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */
         // FIXME: wxGetUserHome could return temporary storage in Unicode mode
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */
         // FIXME: wxGetUserHome could return temporary storage in Unicode mode

-            if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) {
+            if ((s = WXSTRINGCAST wxGetUserHome(wxEmptyString)) != NULL) {

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


@@ -684,11 +621,14 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             nnm = *s ? s + 1 : s;
             *s = 0;
         // FIXME: wxGetUserHome could return temporary storage in Unicode mode
             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;
+            if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL)
+            {
+                if (was_sep) /* replace only if it was there: */
+                    *s = SEP;

                 s = NULL;
                 s = NULL;

-            } else {
+            }
+            else
+            {

                 nm = nnm;
                 s = home;
             }
                 nm = nnm;
                 s = home;
             }


@@ -722,11 +662,13 @@ 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;
 
   wxStrcpy (dest, WXSTRINGCAST filename);
     return (wxChar *) NULL;
 
   wxStrcpy (dest, WXSTRINGCAST filename);


@@ -738,7 +680,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
   const wxChar *val;
 #ifndef __WXWINCE__
   wxChar *tcp;
   const wxChar *val;
 #ifndef __WXWINCE__
   wxChar *tcp;

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

      (tcp = wxStrstr (dest, val)) != NULL)
     {
         wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));
      (tcp = wxStrstr (dest, val)) != NULL)
     {
         wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));


@@ -751,17 +693,22 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
 #endif
 
   // Handle User's home (ignore root homes!)
 #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)
+    return dest;
+
+  const size_t len = wxStrlen(val);
+  if (len <= 2)
+    return dest;
+
+  if (wxStrncmp(dest, val, len) == 0)
+  {
+    wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
+    if (!user.empty())
+           wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
+    wxStrcat(wxFileFunctionsBuffer, dest + len);
+    wxStrcpy (dest, wxFileFunctionsBuffer);
+  }

 
   return dest;
 }
 
   return dest;
 }


@@ -849,14 +796,14 @@ 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
         wxStrcpy (buf, WXSTRINGCAST path);
 
     {
         wxChar buf[_MAXPATHLEN];
 
         // Local copy
         wxStrcpy (buf, WXSTRINGCAST path);
 

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

         int i = l - 1;
 
         // Search backward for a backward or forward slash
         int i = l - 1;
 
         // Search backward for a backward or forward slash


@@ -874,6 +821,9 @@ wxString wxPathOnly (const wxString& path)
             // 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);
             }


@@ -899,7 +849,7 @@ wxString wxPathOnly (const wxString& path)
         }
 #endif
     }
         }
 #endif
     }

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

 }
 
 // Utility for converting delimiters in DOS filenames to UNIX style
 }
 
 // Utility for converting delimiters in DOS filenames to UNIX style


@@ -907,200 +857,71 @@ wxString wxPathOnly (const wxString& path)
 // Also, convert to lower case, since case is significant in UNIX.
 
 #if defined(__WXMAC__)
 // 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);
-    }

 
 

-    // create path string for return value
-    wxString result( thePath , wxConvLocal) ;
+#if TARGET_API_MAC_OSX
+#define kDefaultPathStyle kCFURLPOSIXPathStyle

 #else
 #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 ) ;
+#define kDefaultPathStyle kCFURLHFSPathStyle

 #endif
 
 #endif
 

-    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 ) ;
+    return wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding());

 }
 }

-#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 )
+    CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, wxMacCFStringHolder(path ,wxLocale::GetSystemEncoding() ) , kDefaultPathStyle, false);
+    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 ) ;
-}
-#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) ;
+    CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
+                                                      uniname->unicode,
+                                                      uniname->length );
+    return wxMacCFStringHolder(cfname).AsString() ;

 }
 
 }
 

-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) ) ;
-}
-
-void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
-{
-    wxString var = wxUnix2MacFilename( path ) ;
-    wxMacFilename2FSSpec( var , spec ) ;
+    OSStatus err = noErr ;
+    FSRef fsRef ;
+    wxMacPathToFSRef( path , &fsRef ) ;
+    err = FSRefMakeFSSpec( &fsRef , spec ) ;

 }
 }

-#endif // ! __DARWIN__

 
 #endif // __WXMAC__
 
 
 #endif // __WXMAC__
 


@@ -1114,7 +935,7 @@ wxDos2UnixFilename (wxChar *s)
           *s = _T('/');
 #ifdef __WXMSW__
         else
           *s = _T('/');
 #ifdef __WXMSW__
         else

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

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


@@ -1143,39 +964,38 @@ wxUnix2DosFilename (wxChar *WXUNUSED(s) )
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {

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

 
 

-  while ((ch = getc (fp2)) != EOF)
-    (void) putc (ch, fp3);
-  fclose (fp2);
+#else
+
+    wxUnusedVar(file1);
+    wxUnusedVar(file2);
+    wxUnusedVar(file3);
+    return false;

 
 

-  fclose (fp3);
-  bool result = wxRenameFile(outfile, file3);
-  return result;
+#endif

 }
 
 // Copy files
 }
 
 // Copy files


@@ -1192,12 +1012,15 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool 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(__OS2__)
     }
 #elif defined(__OS2__)

-    if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )
-        return FALSE;
-#else // !Win32
+    if ( ::DosCopy((PSZ)file1.c_str(), (PSZ)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


@@ -1207,13 +1030,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


@@ -1221,26 +1044,19 @@ 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
     // 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__
+    wxCHANGE_UMASK(0);

 
     // create file2 with the same permissions than file1 and open it for
     // writing
 
     wxFile fileOut;
     if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )
 
     // create file2 with the same permissions than file1 and open it for
     // writing
 
     wxFile fileOut;
     if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )

-        return FALSE;
-
-#ifdef __UNIX__
-    /// restore the old umask
-    umask(oldUmask);
-#endif // __UNIX__
+        return false;

 
     // copy contents of file1 to file2
     char buf[4096];
 
     // copy contents of file1 to file2
     char buf[4096];


@@ -1249,21 +1065,21 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
     {
         count = fileIn.Read(buf, WXSIZEOF(buf));
         if ( fileIn.Error() )
     {
         count = fileIn.Read(buf, WXSIZEOF(buf));
         if ( fileIn.Error() )

-            return FALSE;
+            return false;

 
         // end of file?
         if ( !count )
             break;
 
         if ( fileOut.Write(buf, count) < count )
 
         // end of file?
         if ( !count )
             break;
 
         if ( fileOut.Write(buf, count) < count )

-            return FALSE;
+            return false;

     }
 
     // we can expect fileIn to be closed successfully, but we should ensure
     // that fileOut was closed as some write errors (disk full) might not be
     // detected before doing this
     if ( !fileIn.Close() || !fileOut.Close() )
     }
 
     // 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;
+        return false;

 
 #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


@@ -1272,30 +1088,39 @@ 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
 wxRenameFile (const wxString& file1, const wxString& file2)
 {
 }
 
 bool
 wxRenameFile (const wxString& file1, const wxString& file2)
 {

-#ifndef __WXWINCE__
+#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
   if (wxCopyFile(file1, file2)) {
     wxRemoveFile(file1);
 #endif
 
   // Try to copy
   if (wxCopyFile(file1, file2)) {
     wxRemoveFile(file1);

-    return TRUE;
+    return true;

   }
   // Give up
   }
   // Give up

-  return FALSE;
+  return false;

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


@@ -1303,33 +1128,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(wxFNCONV(file));
+#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( wxFNCONV(dir) , 0 ) == 0);

 #else // !Mac
     const wxChar *dirname = dir.c_str();
 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler
 #if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
 #else // !Mac
     const wxChar *dirname = dir.c_str();
 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler
 #if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)

-  #ifndef MSVCRT
-    if ( mkdir(wxFNCONV(dirname), perm) != 0 )
-  #else
+  #if defined(MSVCRT)
+    wxUnusedVar(perm);

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

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

   #endif
 #elif defined(__OS2__)
   #endif
 #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__)


@@ -1341,42 +1175,41 @@ 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
+#if defined(__VMS__)
+    return false; //to be changed since rmdir exists in VMS7.x

 #elif defined(__OS2__)
     return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
 #elif defined(__OS2__)
     return (::DosDeleteDir((PSZ)dir.c_str()) == 0);

-#else
-
-#ifdef __WXWINCE__
+#elif defined(__WXWINCE__)

     return (CreateDirectory(dir, NULL) != 0);
     return (CreateDirectory(dir, NULL) != 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 wxChar *pszPathName)

 {
     wxString strPath(pszPathName);
 
 {
     wxString strPath(pszPathName);
 


@@ -1396,15 +1229,25 @@ bool wxPathExists(const wxChar *pszPathName)
 
 #ifdef __OS2__
     // OS/2 can't handle "d:", it wants either "d:\" or "d:."
 
 #ifdef __OS2__
     // OS/2 can't handle "d:", it wants either "d:\" or "d:."

-    if (strPath.length() == 2 && strPath[1] == _T(':'))
+    if (strPath.length() == 2 && strPath[1u] == _T(':'))

         strPath << _T('.');
 #endif
 
         strPath << _T('.');
 #endif
 

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

     // stat() can't cope with network paths
     DWORD ret = ::GetFileAttributes(strPath);
 
     return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
     // stat() can't cope with network paths
     DWORD ret = ::GetFileAttributes(strPath);
 
     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;
 #else // !__WIN32__
 
     wxStructStat st;


@@ -1421,6 +1264,7 @@ 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)
 {

+#if wxUSE_FILE

     wxString filename = wxFileName::CreateTempFileName(prefix);
     if ( filename.empty() )
         return NULL;
     wxString filename = wxFileName::CreateTempFileName(prefix);
     if ( filename.empty() )
         return NULL;


@@ -1431,11 +1275,17 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
         buf = MYcopystring(filename);
 
     return buf;
         buf = MYcopystring(filename);
 
     return buf;

+#else
+    wxUnusedVar(prefix);
+    wxUnusedVar(buf);
+    // wxFileName::CreateTempFileName needs wxFile class enabled
+    return NULL;
+#endif

 }
 
 bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 {
 }
 
 bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 {

-    buf = wxFileName::CreateTempFileName(prefix);
+    buf = wxGetTempFileName(prefix);

 
     return !buf.empty();
 }
 
     return !buf.empty();
 }


@@ -1448,7 +1298,7 @@ static wxString gs_dirPath;
 wxString wxFindFirstFile(const wxChar *spec, int flags)
 {
     wxSplitPath(spec, &gs_dirPath, NULL, NULL);
 wxString wxFindFirstFile(const wxChar *spec, int flags)
 {
     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;


@@ -1473,7 +1323,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
 
     wxString result;
     gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);
 
     wxString result;
     gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);

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

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


@@ -1489,7 +1339,7 @@ wxString wxFindNextFile()
     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;


@@ -1500,32 +1350,38 @@ 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
 
         char cbuf[_MAXPATHLEN];
     #endif
 


@@ -1533,11 +1389,11 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
         #if wxUSE_UNICODE_MSLU
             if ( wxGetOsVersion() != wxWIN95 )
         #else
         #if wxUSE_UNICODE_MSLU
             if ( wxGetOsVersion() != wxWIN95 )
         #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
 


@@ -1547,42 +1403,29 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
     #if defined(_MSC_VER) || defined(__MINGW32__)
         ok = _getcwd(cbuf, sz) != NULL;
     #elif defined(__WXMAC__) && !defined(__DARWIN__)
     #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 )
+        char lbuf[1024] ;
+        if ( getcwd( lbuf , sizeof( lbuf ) ) )

         {
         {

-            cwdSpec.vRefNum = pb.ioFCBVRefNum;
-            cwdSpec.parID = pb.ioFCBParID;
-            cwdSpec.name[0] = 0 ;
-            wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
-                       wxStrcpy( buf , res ) ;                 
-            ok = TRUE;
+            wxString res( lbuf , *wxConvCurrent ) ;
+            wxStrcpy( buf , res ) ;
+            ok = true;

         }
         else
         }
         else

-        {
-            ok = FALSE;
-        }
+            ok = false ;

     #elif defined(__OS2__)
         APIRET rc;
         ULONG ulDriveNum = 0;
         ULONG ulDriveMap = 0;
     #elif defined(__OS2__)
         APIRET rc;
         ULONG ulDriveNum = 0;
         ULONG ulDriveMap = 0;

-       rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
+        rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);

         ok = rc == 0;
         ok = rc == 0;

-       if (ok)
-       {
-           sz -= 3;
-           rc = ::DosQueryCurrentDir( 0 // current drive
+        if (ok)
+        {
+            sz -= 3;
+            rc = ::DosQueryCurrentDir( 0 // current drive

                                       ,cbuf + 3
                                       ,(PULONG)&sz
                                      );
                                       ,cbuf + 3
                                       ,(PULONG)&sz
                                      );

-            cbuf[0] = 'A' + (ulDriveNum - 1);
+            cbuf[0] = char('A' + (ulDriveNum - 1));

             cbuf[1] = ':';
             cbuf[2] = '\\';
             ok = rc == 0;
             cbuf[1] = ':';
             cbuf[2] = '\\';
             ok = rc == 0;


@@ -1591,7 +1434,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
         ok = getcwd(cbuf, sz) != NULL;
     #endif // platform
 
         ok = getcwd(cbuf, sz) != NULL;
     #endif // platform
 

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

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


@@ -1624,7 +1467,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__
     }
 


@@ -1638,13 +1487,17 @@ 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;
 }
 
     return str;
 }
 


@@ -1655,11 +1508,12 @@ bool wxSetWorkingDirectory(const wxString& d)
 #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
     return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
 #elif defined(__WINDOWS__)
 #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
     return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
 #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
     return (bool)(SetCurrentDirectory(d) != 0);
 #endif
 #else
     return (bool)(SetCurrentDirectory(d) != 0);
 #endif


@@ -1669,11 +1523,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)


@@ -1683,10 +1537,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
 }
 


@@ -1714,11 +1568,11 @@ bool wxEndsWithPathSeparator(const wxChar *pszFileName)
     return len && wxIsPathSeparator(pszFileName[len - 1]);
 }
 
     return len && wxIsPathSeparator(pszFileName[len - 1]);
 }
 

-// find a file in a list of directories, returns FALSE if not found
+// find a file in a list of directories, returns false if not found

 bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
 {
     // we assume that it's not empty
 bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
 {
     // we assume that it's not empty

-    wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE,
+    wxCHECK_MSG( !wxIsEmpty(pszFile), 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


@@ -1753,7 +1607,7 @@ bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFi
 
     delete [] szPath;
 
 
     delete [] szPath;
 

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

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


@@ -1769,44 +1623,156 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
 
 time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
 {
 
 time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
 {

-#ifdef __WXWINCE__
-    FILETIME creationTime, lastAccessTime, lastWriteTime;
-    HANDLE fileHandle = ::CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
-        0, FILE_ATTRIBUTE_NORMAL, 0);
-    if (fileHandle == INVALID_HANDLE_VALUE)
+#if defined(__WXPALMOS__)
+    return 0;
+#elif defined(__WXWINCE__)
+    FILETIME ftLastWrite;
+    AutoHANDLE hFile(::CreateFile(filename, GENERIC_READ, FILE_SHARE_READ,
+                                    NULL, 0, FILE_ATTRIBUTE_NORMAL, 0));
+
+    if ( !hFile.IsOk() )

         return 0;
         return 0;

-    else
+
+    if ( !::GetFileTime(hFile, NULL, NULL, &ftLastWrite) )
+        return 0;
+
+    // sure we want to translate to local time here?
+    FILETIME ftLocal;
+    if ( !::FileTimeToLocalFileTime(&ftLastWrite, &ftLocal) )

     {
     {

-        if (GetFileTime(fileHandle, & creationTime, & lastAccessTime, & lastWriteTime))
-        {
-            CloseHandle(fileHandle);
+        wxLogLastError(_T("FileTimeToLocalFileTime"));
+    }
+
+    // FILETIME is a counted in 100-ns since 1601-01-01, convert it to
+    // number of seconds since 1970-01-01
+    ULARGE_INTEGER uli;
+    uli.LowPart = ftLocal.dwLowDateTime;
+    uli.HighPart = ftLocal.dwHighDateTime;
+
+    ULONGLONG ull = uli.QuadPart;
+    ull /= wxULL(10000000);     // number of 100ns intervals in 1s
+    ull -= wxULL(11644473600);  // 1970-01-01 - 1601-01-01 in seconds
+
+    return wx_static_cast(time_t, ull);
+#else
+    wxStructStat buf;
+    if ( wxStat( filename, &buf) != 0 )
+        return 0;
+
+    return buf.st_mtime;
+#endif
+}
+

 
 

-            wxDateTime dateTime;
-            FILETIME ftLocal;
-            if ( !::FileTimeToLocalFileTime(&lastWriteTime, &ftLocal) )
+// 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 WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
+                                           wxArrayString& descriptions,
+                                           wxArrayString& filters)
+{
+    descriptions.Clear();
+    filters.Clear();
+
+    wxString str(filterStr);
+
+    wxString description, filter;
+    int pos = 0;
+    while( pos != wxNOT_FOUND )
+    {
+        pos = str.Find(wxT('|'));
+        if ( pos == wxNOT_FOUND )
+        {
+            // if there are no '|'s at all in the string just take the entire
+            // string as filter and make description empty for later autocompletion
+            if ( filters.IsEmpty() )

             {
             {

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

     }
     }

-#else
-    wxStructStat buf;
-    wxStat( filename, &buf);

 
 

-    return buf.st_mtime;
+#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
 #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();

 }
 
 
 }
 
 


@@ -1823,142 +1789,194 @@ bool wxIsWild( const wxString& pattern )
         switch (*pat++)
         {
         case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
         switch (*pat++)
         {
         case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):

-            return TRUE;
+            return true;

         case wxT('\\'):
             if (!*pat++)
         case wxT('\\'):
             if (!*pat++)

-                return FALSE;
+                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;
+            }

         }
         }

+    }
+}
+
+// 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;
+#else
+    return fp ? wxGetFileKind(fileno(fp)) : wxFILE_KIND_UNKNOWN;
+#endif
+}

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