Enable graphics context by default

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 2bd1b05de35d88d92155a838b37ceb93c35495c4..7a8f627a555d2bd5e0724a64582c2376799b9a29 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -30,8 +30,10 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"

+    #include "wx/crt.h"

 #endif
 
 #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"


@@ -54,7 +56,7 @@
 #endif
 
 #if defined(__WXMAC__)
 #endif
 
 #if defined(__WXMAC__)

-    #include  "wx/mac/private.h"  // includes mac headers
+    #include  "wx/osx/private.h"  // includes mac headers

 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__


@@ -94,10 +96,6 @@
     #define _MAXPATHLEN 1024
 #endif
 
     #define _MAXPATHLEN 1024
 #endif
 

-#ifdef __WXMAC__
-#    include "MoreFilesX.h"
-#endif
-

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


@@ -128,38 +126,14 @@ const int wxInvalidOffset = -1;
 // wrappers around standard POSIX functions
 // ----------------------------------------------------------------------------
 
 // wrappers around standard POSIX functions
 // ----------------------------------------------------------------------------
 

-#ifdef wxNEED_WX_UNISTD_H
-
-WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
-{
-    return stat( wxConvFile.cWX2MB( file_name ), buf );
-}
-
-WXDLLEXPORT int wxLstat( const wxChar *file_name, wxStructStat *buf )
-{
-    return lstat( wxConvFile.cWX2MB( file_name ), buf );
-}
-
-WXDLLEXPORT int wxAccess( const wxChar *pathname, int mode )
-{
-    return access( wxConvFile.cWX2MB( pathname ), mode );
-}
-
-WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode )
-{
-    return open( wxConvFile.cWX2MB( pathname ), flags, mode );
-}
-
-#endif // wxNEED_WX_UNISTD_H
-

 #if wxUSE_UNICODE && defined __BORLANDC__ \
     && __BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551
 
 // 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.
 #if wxUSE_UNICODE && defined __BORLANDC__ \
     && __BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551
 
 // 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 wxOpen(const wchar_t *pathname, int flags, mode_t mode)
+//
+int wxCRT_Open(const wchar_t *pathname, int flags, mode_t mode)

 {
     int moreflags = 0;
 
 {
     int moreflags = 0;
 


@@ -324,9 +298,10 @@ static inline wxChar* MYcopystring(const wxString& s)
     return wxStrcpy(copy, s.c_str());
 }
 
     return wxStrcpy(copy, s.c_str());
 }
 

-static inline wxChar* MYcopystring(const wxChar* s)
+template<typename CharType>
+static inline CharType* MYcopystring(const CharType* s)

 {
 {

-    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    CharType* copy = new CharType[wxStrlen(s) + 1];

     return wxStrcpy(copy, s);
 }
 
     return wxStrcpy(copy, s);
 }
 


@@ -339,7 +314,7 @@ wxFileExists (const wxString& filename)
 #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
 #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

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


@@ -365,20 +340,9 @@ wxIsAbsolutePath (const wxString& filename)
 {
     if (!filename.empty())
     {
 {
     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('/'))
             return true;
         // Unix like or Windows
         if (filename[0] == wxT('/'))
             return true;

-#endif

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


@@ -398,7 +362,8 @@ wxIsAbsolutePath (const wxString& filename)
  *
  */
 
  *
  */
 

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

 {
     int len = wxStrlen(buffer);
     int i = len-1;
 {
     int len = wxStrlen(buffer);
     int i = len-1;


@@ -413,6 +378,9 @@ void wxStripExtension(wxChar *buffer)
     }
 }
 
     }
 }
 

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

 void wxStripExtension(wxString& buffer)
 {
     //RN:  Be careful about the handling the case where
 void wxStripExtension(wxString& buffer)
 {
     //RN:  Be careful about the handling the case where


@@ -428,17 +396,16 @@ void wxStripExtension(wxString& buffer)
 }
 
 // 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


@@ -449,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


@@ -483,6 +450,16 @@ 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);
 wxString wxRealPath(const wxString& path)
 {
     wxChar *buf1=MYcopystring(path);


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


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


@@ -645,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(wxEmptyString)) != 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


@@ -668,8 +647,8 @@ 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)
+            homepath = wxGetUserHome(wxString(nm + 1));
+            if (homepath.empty())

             {
                 if (was_sep) /* replace only if it was there: */
                     *s = SEP;
             {
                 if (was_sep) /* replace only if it was there: */
                     *s = SEP;


@@ -678,7 +657,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             else
             {
                 nm = nnm;
             else
             {
                 nm = nnm;

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

             }
         }
     }
             }
         }
     }


@@ -702,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:
 


@@ -719,22 +709,22 @@ wxContractPath (const wxString& filename,
   if (filename.empty())
     return (wxChar *) NULL;
 
   if (filename.empty())
     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.empty() && (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);
     }
         wxStrcat (tcp, wxT("}"));
         wxStrcat (tcp, wxFileFunctionsBuffer);
     }


@@ -742,10 +732,10 @@ wxContractPath (const wxString& filename,
 
   // Handle User's home (ignore root homes!)
   val = wxGetUserHome (user);
 
   // Handle User's home (ignore root homes!)
   val = wxGetUserHome (user);

-  if (!val)
+  if (val.empty())

     return dest;
 
     return dest;
 

-  const size_t len = wxStrlen(val);
+  const size_t len = val.length();

   if (len <= 2)
     return dest;
 
   if (len <= 2)
     return dest;
 


@@ -753,7 +743,7 @@ wxContractPath (const wxString& filename,
   {
     wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
     if (!user.empty())
   {
     wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
     if (!user.empty())

-           wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
+           wxStrcat(wxFileFunctionsBuffer, user);

     wxStrcat(wxFileFunctionsBuffer, dest + len);
     wxStrcpy (dest, wxFileFunctionsBuffer);
   }
     wxStrcat(wxFileFunctionsBuffer, dest + len);
     wxStrcpy (dest, wxFileFunctionsBuffer);
   }


@@ -801,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(']'))
             {


@@ -849,7 +829,7 @@ wxString wxPathOnly (const wxString& path)
         wxChar buf[_MAXPATHLEN];
 
         // Local copy
         wxChar buf[_MAXPATHLEN];
 
         // Local copy

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

 
         int l = path.length();
         int i = l - 1;
 
         int l = path.length();
         int i = l - 1;


@@ -857,15 +837,6 @@ wxString wxPathOnly (const wxString& 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 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('\\'))
             {


@@ -875,7 +846,6 @@ wxString wxPathOnly (const wxString& path)
                 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(']'))
             {


@@ -904,13 +874,9 @@ wxString wxPathOnly (const wxString& path)
 // and back again - or we get nasty problems with delimiters.
 // Also, convert to lower case, since case is significant in UNIX.
 
 // and back again - or we get nasty problems with delimiters.
 // Also, convert to lower case, since case is significant in UNIX.
 

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

 
 

-#if TARGET_API_MAC_OSX

 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 #define kDefaultPathStyle kCFURLPOSIXPathStyle

-#else
-#define kDefaultPathStyle kCFURLHFSPathStyle
-#endif

 
 wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
 {
 
 wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
 {


@@ -928,13 +894,13 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
     CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
     CFRelease( cfString );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
     CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
     CFRelease( cfString );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);

-    return wxMacCFStringHolder(cfMutableString).AsString();
+    return wxCFStringRef(cfMutableString).AsString();

 }
 
 OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
 {
     OSStatus err = noErr ;
 }
 
 OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
 {
     OSStatus err = noErr ;

-    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxMacCFStringHolder(path));
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(path));

     CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
     CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
     CFRelease( cfMutableString );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
     CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
     CFRelease( cfMutableString );


@@ -959,7 +925,7 @@ wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )
     CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
     CFRelease( cfname );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
     CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
     CFRelease( cfname );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);

-    return wxMacCFStringHolder(cfMutableString).AsString() ;
+    return wxCFStringRef(cfMutableString).AsString() ;

 }
 
 #ifndef __LP64__
 }
 
 #ifndef __LP64__


@@ -976,17 +942,18 @@ wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
 
 void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
 {
 
 void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
 {

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

 }
 #endif
 
 #endif // __WXMAC__
 
 }
 #endif
 
 #endif // __WXMAC__
 

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

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


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

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

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

-void
+void wxDos2UnixFilename(char *s) { wxDoDos2UnixFilename(s); }
+void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); }
+
+template<typename T>
+static void

 #if defined(__WXMSW__) || defined(__OS2__)
 #if defined(__WXMSW__) || defined(__OS2__)

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


@@ -1020,6 +991,9 @@ 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)


@@ -1058,6 +1032,51 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
 #endif
 }
 
 #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;
+
+        // end of file?
+        if ( !count )
+            break;
+
+        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)


@@ -1067,7 +1086,7 @@ 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());


@@ -1075,7 +1094,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
         return false;
     }
 #elif defined(__OS2__)
         return false;
     }
 #elif defined(__OS2__)

-    if ( ::DosCopy((PSZ)file1.c_str(), (PSZ)file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )
+    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 defined(__PALMOS__)
     // TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/


@@ -1107,39 +1126,49 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
         return false;
     }
 
         return false;
     }
 

-    // reset the umask as we want to create the file with exactly the same
-    // permissions as the original one
-    wxCHANGE_UMASK(0);
+    wxDoCopyFile(fileIn, fbuf, file2, overwrite);

 
 

-    // create file2 with the same permissions than file1 and open it for
-    // writing
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+    // copy the resource fork of the file too if it's present
+    wxString pathRsrcOut;
+    wxFile fileRsrcIn;

 
 

-    wxFile fileOut;
-    if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )
-        return false;
-
-    // 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


@@ -1204,7 +1233,7 @@ bool wxRemoveFile(const wxString& file)
  || (defined(__MWERKS__) && defined(__MSL__))
     int res = wxRemove(file);
 #elif defined(__WXMAC__)
  || (defined(__MWERKS__) && defined(__MSL__))
     int res = wxRemove(file);
 #elif defined(__WXMAC__)

-    int res = unlink(wxFNCONV(file));
+    int res = unlink(file.fn_str());

 #elif defined(__WXPALMOS__)
     int res = 1;
     // TODO with VFSFileDelete()
 #elif defined(__WXPALMOS__)
     int res = 1;
     // TODO with VFSFileDelete()


@@ -1220,7 +1249,7 @@ bool wxMkdir(const wxString& dir, int perm)
 #if defined(__WXPALMOS__)
     return false;
 #elif defined(__WXMAC__) && !defined(__UNIX__)
 #if defined(__WXPALMOS__)
     return false;
 #elif defined(__WXMAC__) && !defined(__UNIX__)

-    return (mkdir( wxFNCONV(dir) , 0 ) == 0);
+    return (mkdir(dir.fn_str() , 0 ) == 0);

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


@@ -1268,9 +1297,9 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 #if defined(__VMS__)
     return false; //to be changed since rmdir exists in VMS7.x
 #elif defined(__OS2__)
 #if defined(__VMS__)
     return false; //to be changed since rmdir exists in VMS7.x
 #elif defined(__OS2__)

-    return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
+    return (::DosDeleteDir(dir.c_str()) == 0);

 #elif defined(__WXWINCE__)
 #elif defined(__WXWINCE__)

-    return (CreateDirectory(dir, NULL) != 0);
+    return (RemoveDirectory(dir) != 0);

 #elif defined(__WXPALMOS__)
     // TODO with VFSFileRename()
     return false;
 #elif defined(__WXPALMOS__)
     // TODO with VFSFileRename()
     return false;


@@ -1280,9 +1309,9 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 }
 
 // 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 wxDirExists(const wxChar *pszPathName)
+bool wxDirExists(const wxString& pathName)

 {
 {

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

 
 #if defined(__WINDOWS__) || defined(__OS2__)
     // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
 
 #if defined(__WINDOWS__) || defined(__OS2__)
     // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,


@@ -1308,7 +1337,7 @@ bool wxDirExists(const wxChar *pszPathName)
     return false;
 #elif defined(__WIN32__) && !defined(__WXMICROWIN__)
     // stat() can't cope with network paths
     return false;
 #elif defined(__WIN32__) && !defined(__WXMICROWIN__)
     // 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);
 #elif defined(__OS2__)
 
     return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
 #elif defined(__OS2__)


@@ -1326,7 +1355,7 @@ bool wxDirExists(const wxChar *pszPathName)
     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
     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

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


@@ -1340,7 +1369,12 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
         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);
 


@@ -1366,7 +1400,7 @@ 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);
     if ( gs_dirPath.empty() )
 {
     wxSplitPath(spec, &gs_dirPath, NULL, NULL);
     if ( gs_dirPath.empty() )


@@ -1374,8 +1408,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     if ( !wxEndsWithPathSeparator(gs_dirPath ) )
         gs_dirPath << wxFILE_SEP_PATH;
 
     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() )


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

-    gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);
+    gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags);

     if ( result.empty() )
     {
         wxDELETE(gs_dir);
     if ( result.empty() )
     {
         wxDELETE(gs_dir);


@@ -1405,7 +1438,7 @@ 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);


@@ -1473,16 +1506,6 @@ wxChar *wxDoGetCwd(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__)
-        char lbuf[1024] ;
-        if ( getcwd( lbuf , sizeof( lbuf ) ) )
-        {
-            wxString res( lbuf , *wxConvCurrent ) ;
-            wxStrcpy( buf , res ) ;
-            ok = true;
-        }
-        else
-            ok = false ;

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


@@ -1505,7 +1528,7 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
         ok = getcwd(cbuf, sz) != NULL;
     #endif // platform
 
         ok = getcwd(cbuf, sz) != NULL;
     #endif // platform
 

-    #if wxUSE_UNICODE && !(defined(__WXMAC__) && !defined(__DARWIN__))
+    #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


@@ -1575,7 +1598,15 @@ wxString wxGetCwd()
 bool wxSetWorkingDirectory(const wxString& d)
 {
 #if defined(__OS2__)
 bool wxSetWorkingDirectory(const wxString& d)
 {
 #if defined(__OS2__)

-    return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
+    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);
 #elif defined(__WINDOWS__)
 #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
     return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
 #elif defined(__WINDOWS__)


@@ -1586,7 +1617,7 @@ bool wxSetWorkingDirectory(const wxString& d)
     wxUnusedVar(d);
     return false;
 #else
     wxUnusedVar(d);
     return false;
 #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.


@@ -1625,76 +1656,62 @@ 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
 }
 
 // find a file in a list of directories, returns false if not found

-bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
+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(pszFileName, pstrPath, pstrName, pstrExt);
+    wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);

 }
 
 #if wxUSE_DATETIME
 
 }
 
 #if wxUSE_DATETIME
 

-time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)

 {
     wxDateTime mtime;
     if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
 {
     wxDateTime mtime;
     if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )


@@ -1710,7 +1727,7 @@ time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
 // Returns 0 if none or if there's a problem.
 // filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"
 
 // 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,
+int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,

                                            wxArrayString& descriptions,
                                            wxArrayString& filters)
 {
                                            wxArrayString& descriptions,
                                            wxArrayString& filters)
 {


@@ -1833,7 +1850,7 @@ static bool wxCheckWin32Permission(const wxString& path, DWORD access)
 
     HANDLE h = ::CreateFile
                  (
 
     HANDLE h = ::CreateFile
                  (

-                    path.c_str(),
+                    path.t_str(),

                     access,
                     FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                     NULL,
                     access,
                     FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                     NULL,


@@ -1852,7 +1869,7 @@ bool wxIsWritable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links

-    return access(wxConvFile.cWX2MB(path), W_OK) == 0;
+    return wxAccess(path.c_str(), W_OK) == 0;

 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_WRITE);
 #else
 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_WRITE);
 #else


@@ -1866,7 +1883,7 @@ bool wxIsReadable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links

-    return access(wxConvFile.cWX2MB(path), R_OK) == 0;
+    return wxAccess(path.c_str(), R_OK) == 0;

 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_READ);
 #else
 #elif defined( __WINDOWS__ )
     return wxCheckWin32Permission(path, GENERIC_READ);
 #else


@@ -1880,7 +1897,7 @@ bool wxIsExecutable(const wxString &path)
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links
 {
 #if defined( __UNIX__ ) || defined(__OS2__)
     // access() will take in count also symbolic links

-    return access(wxConvFile.cWX2MB(path), X_OK) == 0;
+    return wxAccess(path.c_str(), X_OK) == 0;

 #elif defined( __WINDOWS__ )
    return wxCheckWin32Permission(path, GENERIC_EXECUTE);
 #else
 #elif defined( __WINDOWS__ )
    return wxCheckWin32Permission(path, GENERIC_EXECUTE);
 #else


@@ -1970,17 +1987,19 @@ wxFileKind wxGetFileKind(FILE *fp)
 
 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;