fix from Robert

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 9cea28b83a58b488b6a00be4fdd44084cc943cd2..4adda9147010291762f87cec893b441e47d71a7c 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -29,10 +29,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

 #include "wx/utils.h"
 #include "wx/intl.h"
 
 #include "wx/utils.h"
 #include "wx/intl.h"
 


@@ -66,9 +62,9 @@
     #include <dirent.h>
 #endif
 
     #include <dirent.h>
 #endif
 

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

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

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

 #endif
 #ifdef __WINDOWS__
 #if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
 #endif
 #ifdef __WINDOWS__
 #if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)


@@ -132,7 +128,7 @@ static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //
 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //

-// VisualAge C++ V4.0 cannot have any external linkage const decs 
+// 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;
 // in headers included by more than one primary source
 //
 const off_t wxInvalidOffset = (off_t)-1;


@@ -277,14 +273,10 @@ wxFileExists (const wxString& filename)
     return FALSE ;
 #else
 
     return FALSE ;
 #else
 

-#ifdef __SALFORDC__
-  struct _stat stbuf;
-#else
-  struct stat stbuf;
-#endif
-
-  if ((filename != wxT("")) && stat (wxFNSTRINGCAST filename.fn_str(), &stbuf) == 0)
+  wxStructStat stbuf;
+  if ((filename != wxT("")) && wxStat (wxFNSTRINGCAST filename.fn_str(), &stbuf) == 0)

     return TRUE;
     return TRUE;

+

   return FALSE;
 #endif
 }
   return FALSE;
 #endif
 }


@@ -570,7 +562,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
         /* prefix ~ */
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */
         /* prefix ~ */
         if (nm[1] == SEP || nm[1] == 0)
         {        /* ~/filename */

-           // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+        // FIXME: wxGetUserHome could return temporary storage in Unicode mode

             if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) {
                 if (*++nm)
                     nm++;
             if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) {
                 if (*++nm)
                     nm++;


@@ -584,7 +576,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;
             *s = 0;
             was_sep = (*s == SEP);
             nnm = *s ? s + 1 : s;
             *s = 0;

-           // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+        // FIXME: wxGetUserHome could return temporary storage in Unicode mode

             if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) {
                if (was_sep) /* replace only if it was there: */
                    *s = SEP;
             if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) {
                if (was_sep) /* replace only if it was there: */
                    *s = SEP;


@@ -753,10 +745,11 @@ wxPathOnly (wxChar *path)
         {
           done = TRUE;
 #ifdef __VMS__
         {
           done = TRUE;
 #ifdef __VMS__

-          buf[i+1] = 0;
-#else
+          if ( path[i] == wxT(']') )
+            buf[i+1] = 0;
+          else
+#endif      

           buf[i] = 0;
           buf[i] = 0;

-#endif

 
           return buf;
         }
 
           return buf;
         }


@@ -801,10 +794,11 @@ wxString wxPathOnly (const wxString& path)
         {
           done = TRUE;
 #ifdef __VMS__
         {
           done = TRUE;
 #ifdef __VMS__

-          buf[i+1] = 0;
-#else
+          if ( path[i] == wxT(']') )
+            buf[i+1] = 0;
+          else
+#endif      

           buf[i] = 0;
           buf[i] = 0;

-#endif

 
           return wxString(buf);
         }
 
           return wxString(buf);
         }


@@ -836,8 +830,8 @@ static char sMacFileNameConversion[ 1000 ] ;
 
 wxString wxMac2UnixFilename (const char *str)
 {
 
 wxString wxMac2UnixFilename (const char *str)
 {

-       char *s = sMacFileNameConversion ;
-       strcpy( s , str ) ;
+    char *s = sMacFileNameConversion ;
+    strcpy( s , str ) ;

   if (s)
   {
     memmove( s+1 , s ,strlen( s ) + 1) ;
   if (s)
   {
     memmove( s+1 , s ,strlen( s ) + 1) ;


@@ -860,8 +854,8 @@ wxString wxMac2UnixFilename (const char *str)
 
 wxString wxUnix2MacFilename (const char *str)
 {
 
 wxString wxUnix2MacFilename (const char *str)
 {

-       char *s = sMacFileNameConversion ;
-       strcpy( s , str ) ;
+    char *s = sMacFileNameConversion ;
+    strcpy( s , str ) ;

   if (s)
   {
     if ( *s == '.' )
   if (s)
   {
     if ( *s == '.' )


@@ -882,13 +876,13 @@ wxString wxUnix2MacFilename (const char *str)
     {
       if (*s == '/' || *s == '\\')
       {
     {
       if (*s == '/' || *s == '\\')
       {

-       // convert any back-directory situations
-       if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) )
-       {
+          // convert any back-directory situations
+          if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) )
+          {

           *s = ':';
           *s = ':';

-                       memmove( s+1 , s+3 ,strlen( s+3 ) + 1 ) ;
-       }
-       else
+                memmove( s+1 , s+3 ,strlen( s+3 ) + 1 ) ;
+          }
+          else

           *s = ':';
       }
 
           *s = ':';
       }
 


@@ -900,36 +894,36 @@ wxString wxUnix2MacFilename (const char *str)
 
 wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
 {
 
 wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
 {

-       Handle  myPath ;
-       short   length ;
-       
-       FSpGetFullPath( spec , &length , &myPath ) ;
-       ::SetHandleSize( myPath , length + 1 ) ;
-       ::HLock( myPath ) ;
-       (*myPath)[length] = 0 ;
-       if ( length > 0 && (*myPath)[length-1] ==':' )
-               (*myPath)[length-1] = 0 ;
-       
-       wxString result(        (char*) *myPath ) ;
-       ::HUnlock( myPath ) ;
-       ::DisposeHandle( myPath ) ;
-       return result ;
+    Handle    myPath ;
+    short     length ;
+
+    FSpGetFullPath( spec , &length , &myPath ) ;
+    ::SetHandleSize( myPath , length + 1 ) ;
+    ::HLock( myPath ) ;
+    (*myPath)[length] = 0 ;
+    if ( length > 0 && (*myPath)[length-1] ==':' )
+        (*myPath)[length-1] = 0 ;
+
+    wxString result(     (char*) *myPath ) ;
+    ::HUnlock( myPath ) ;
+    ::DisposeHandle( myPath ) ;
+    return result ;

 }
 
 wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
 {
 }
 
 wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
 {

-       return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
+    return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;

 }
 
 void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
 {
 }
 
 void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
 {

-       FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
+    FSpLocationFromFullPath( strlen(path ) , path , spec ) ;

 }
 
 void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
 {
 }
 
 void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
 {

-       wxString var = wxUnix2MacFilename( path ) ;
-       wxMacFilename2FSSpec( var , spec ) ;
+    wxString var = wxUnix2MacFilename( path ) ;
+    wxMacFilename2FSSpec( var , spec ) ;

 }
 
 #endif
 }
 
 #endif


@@ -1050,7 +1044,7 @@ wxRenameFile (const wxString& file1, const wxString& file2)
     return TRUE;
 #else
   // Normal system call
     return TRUE;
 #else
   // Normal system call

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

     return TRUE;
 #endif
   // Try to copy
     return TRUE;
 #endif
   // Try to copy


@@ -1065,7 +1059,7 @@ wxRenameFile (const wxString& file1, const wxString& file2)
 bool wxRemoveFile(const wxString& file)
 {
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
 bool wxRemoveFile(const wxString& file)
 {
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)

-  int flag = remove(wxFNSTRINGCAST file.fn_str());
+  int flag = wxRemove(file);

 #elif defined( __WXMAC__ )
   int flag = unlink(wxUnix2MacFilename( file ));
 #else
 #elif defined( __WXMAC__ )
   int flag = unlink(wxUnix2MacFilename( file ));
 #else


@@ -1083,10 +1077,12 @@ bool wxMkdir(const wxString& dir, int perm)
 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler
 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler

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

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

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

 #else  // !MSW and !OS/2 VAC++
 #else  // !MSW and !OS/2 VAC++

-    if ( mkdir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
+    if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )

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


@@ -1104,12 +1100,14 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
   return FALSE; //to be changed since rmdir exists in VMS7.x
 #elif defined( __WXMAC__ )
   return (rmdir(wxUnix2MacFilename( dir )) == 0);
   return FALSE; //to be changed since rmdir exists in VMS7.x
 #elif defined( __WXMAC__ )
   return (rmdir(wxUnix2MacFilename( dir )) == 0);

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

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

-  return (rmdir(wxFNSTRINGCAST dir.fn_str()) == 0);
+  return (wxRmDir(wxFNSTRINGCAST dir.fn_str()) == 0);

 #endif
 
 #endif
 #endif
 
 #endif


@@ -1164,19 +1162,31 @@ bool wxDirExists(const wxString& dir)
 // does the path exists? (may have or not '/' or '\\' at the end)
 bool wxPathExists(const wxChar *pszPathName)
 {
 // does the path exists? (may have or not '/' or '\\' at the end)
 bool wxPathExists(const wxChar *pszPathName)
 {

-  /* Windows API returns -1 from stat for "c:\dir\" if "c:\dir" exists
-   * OTOH, we should change "d:" to "d:\" and leave "\" as is. */
-  wxString strPath(pszPathName);
-  if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != wxT('\0') )
-    strPath.Last() = wxT('\0');
+    wxString strPath(pszPathName);
+#ifdef __WINDOWS__
+    // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
+    // so remove all trailing backslashes from the path - but don't do this for
+    // the pathes "d:\" (which are different from "d:") nor for just "\"
+    while ( wxEndsWithPathSeparator(strPath) )
+    {
+        size_t len = strPath.length();
+        if ( len == 1 || strPath[len - 1] == _T(':') )
+            break;

 
 

-#ifdef __SALFORDC__
-  struct _stat st;
+        strPath.Truncate(len - 1);
+    }
+#endif // __WINDOWS__
+
+    wxStructStat st;
+#ifndef __VISAGECPP__
+    return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 &&
+        ((st.st_mode & S_IFMT) == S_IFDIR);

 #else
 #else

-  struct stat st;
+    // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only
+    return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 &&
+        (st.st_mode == S_IFDIR);

 #endif
 
 #endif
 

-  return stat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && (st.st_mode & S_IFDIR);

 }
 
 // Get a temporary filename, opening and closing the file.
 }
 
 // Get a temporary filename, opening and closing the file.


@@ -1253,7 +1263,10 @@ bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 wxString wxFindFirstFile(const wxChar *spec, int flags)
 {
     wxString result;
 wxString wxFindFirstFile(const wxChar *spec, int flags)
 {
     wxString result;

-
+#ifdef __VMS
+   wxChar *specvms = NULL;
+#endif
+   

 #if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
     if (gs_dirStream)
         closedir(gs_dirStream); // edz 941103: better housekeping
 #if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )
     if (gs_dirStream)
         closedir(gs_dirStream); // edz 941103: better housekeping


@@ -1268,11 +1281,29 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
 
     // special case: path is really "/"
     if ( !path && gs_strFileSpec[0u] == wxT('/') )
 
     // special case: path is really "/"
     if ( !path && gs_strFileSpec[0u] == wxT('/') )

-        path = wxT('/');
-    // path is empty => Local directory
+#ifdef __VMS
+     {
+       wxStrcpy( specvms , wxT( "[000000]" ) );
+       gs_strFileSpec = specvms;
+       wxString path_vms(wxPathOnly(gs_strFileSpec));
+       path = path_vms;
+     }
+#else
+     path = wxT('/');
+#endif
+   // path is empty => Local directory

     if ( !path )
     if ( !path )

-        path = wxT('.');
-
+#ifdef __VMS
+     {
+       wxStrcpy( specvms , wxT( "[]" ) );
+       gs_strFileSpec = specvms;
+       wxString path_vms1(wxPathOnly(gs_strFileSpec));
+       path = path_vms1;
+     }
+#else
+     path = wxT('.');
+#endif
+   

     gs_dirStream = opendir(path.fn_str());
     if ( !gs_dirStream )
     {
     gs_dirStream = opendir(path.fn_str());
     if ( !gs_dirStream )
     {


@@ -1311,8 +1342,8 @@ wxString wxFindNextFile()
           nextDir = readdir(gs_dirStream) )
     {
         if (wxMatchWild(name, nextDir->d_name, FALSE) &&   // RR: added FALSE to find hidden files
           nextDir = readdir(gs_dirStream) )
     {
         if (wxMatchWild(name, nextDir->d_name, FALSE) &&   // RR: added FALSE to find hidden files

-           strcmp(nextDir->d_name, ".") && 
-           strcmp(nextDir->d_name, "..") )
+        strcmp(nextDir->d_name, ".") &&
+        strcmp(nextDir->d_name, "..") )

         {
             result.Empty();
             if ( !path.IsEmpty() )
         {
             result.Empty();
             if ( !path.IsEmpty() )


@@ -1360,10 +1391,10 @@ wxString wxFindNextFile()
 
 struct MacDirectoryIterator
 {
 
 struct MacDirectoryIterator
 {

-       CInfoPBRec                      m_CPB ;
-       wxInt16                         m_index ;
-       long                            m_dirId ;
-       Str255                          m_name ;
+    CInfoPBRec            m_CPB ;
+    wxInt16                m_index ;
+    long                m_dirId ;
+    Str255                m_name ;

 } ;
 
 static int g_iter_flags ;
 } ;
 
 static int g_iter_flags ;


@@ -1381,57 +1412,57 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     if ( !path.IsEmpty() )
         result << path << wxT('\\');
 
     if ( !path.IsEmpty() )
         result << path << wxT('\\');
 

-       FSSpec fsspec ;
-
-       wxUnixFilename2FSSpec( result , &fsspec ) ;
-       g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
-       g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ;
-       g_iter.m_index = 0 ;
-       
-       Boolean isDir ;
-       FSpGetDirectoryID( &fsspec , &g_iter.m_dirId , &isDir ) ;
-       if ( !isDir )
-               return wxEmptyString ;
-               
-       return wxFindNextFile( ) ;
+    FSSpec fsspec ;
+
+    wxUnixFilename2FSSpec( result , &fsspec ) ;
+    g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
+    g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ;
+    g_iter.m_index = 0 ;
+
+    Boolean isDir ;
+    FSpGetDirectoryID( &fsspec , &g_iter.m_dirId , &isDir ) ;
+    if ( !isDir )
+        return wxEmptyString ;
+
+    return wxFindNextFile( ) ;

 }
 
 wxString wxFindNextFile()
 {
     wxString result;
 
 }
 
 wxString wxFindNextFile()
 {
     wxString result;
 

-       short err = noErr ;
-       
-       while ( err == noErr )
-       {
-               g_iter.m_index++ ;
-               g_iter.m_CPB.dirInfo.ioFDirIndex = g_iter.m_index;
-               g_iter.m_CPB.dirInfo.ioDrDirID = g_iter.m_dirId;        /* we need to do this every time */
-               err = PBGetCatInfoSync((CInfoPBPtr)&g_iter.m_CPB);
-               if ( err != noErr )
-                       break ;
-                       
-               if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (g_iter_flags & wxDIR) ) //  we have a directory
-                       break ;
-                       
-               if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) )
-                       continue ;
-                        
-               // hit !
-               break ;
-       }
-       if ( err != noErr )
-       {
-               return wxEmptyString ;
-       }
-       FSSpec spec ;
-       
-       FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum,
-                                                                  g_iter.m_dirId,
-                                                                  g_iter.m_name,
-                                                                  &spec) ;
-                                                                 
-       return wxMacFSSpec2UnixFilename( &spec ) ;
+    short err = noErr ;
+
+    while ( err == noErr )
+    {
+        g_iter.m_index++ ;
+        g_iter.m_CPB.dirInfo.ioFDirIndex = g_iter.m_index;
+        g_iter.m_CPB.dirInfo.ioDrDirID = g_iter.m_dirId;    /* we need to do this every time */
+        err = PBGetCatInfoSync((CInfoPBPtr)&g_iter.m_CPB);
+        if ( err != noErr )
+            break ;
+
+        if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (g_iter_flags & wxDIR) ) //  we have a directory
+            break ;
+
+        if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) )
+            continue ;
+
+        // hit !
+        break ;
+    }
+    if ( err != noErr )
+    {
+        return wxEmptyString ;
+    }
+    FSSpec spec ;
+
+    FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum,
+                                   g_iter.m_dirId,
+                                   g_iter.m_name,
+                                   &spec) ;
+
+    return wxMacFSSpec2UnixFilename( &spec ) ;

 }
 
 #elif defined(__WXMSW__)
 }
 
 #elif defined(__WXMSW__)


@@ -1485,9 +1516,9 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     result += gs_findDataStruct.cFileName;
 
     return result;
     result += gs_findDataStruct.cFileName;
 
     return result;

-#else
+#else // !Win32

     int flag = _A_NORMAL;
     int flag = _A_NORMAL;

-    if (flags & wxDIR) /* MATTHEW: [5] Use & */
+    if (flags & wxDIR)

         flag = _A_SUBDIR;
 
 #ifdef __BORLANDC__
         flag = _A_SUBDIR;
 
 #ifdef __BORLANDC__


@@ -1496,7 +1527,6 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
         if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
 #endif
         {
         if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
 #endif
         {

-            /* MATTHEW: [5] Check directory flag */

             char attrib;
 
 #ifdef __BORLANDC__
             char attrib;
 
 #ifdef __BORLANDC__


@@ -1519,11 +1549,12 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
 #endif
                     ;
         }
 #endif
                     ;
         }

-#endif // __WIN32__

 
     return result;
 
     return result;

+#endif // __WIN32__

 }
 
 }
 

+

 wxString wxFindNextFile()
 {
     wxString result;
 wxString wxFindNextFile()
 {
     wxString result;


@@ -1590,12 +1621,56 @@ try_again:
 #endif
                       ;
         }
 #endif
                       ;
         }

+
+    return result;

 #endif // Win32/16
 #endif // Win32/16

+}
+
+#elif defined(__WXPM__)
+
+wxString wxFindFirstFile(const wxChar *spec, int flags)
+{
+    wxString result;
+
+    /*
+    // TODO: figure something out here for OS/2
+    gs_strFileSpec = spec;
+    gs_findFlags = flags;
+
+    // Find path only so we can concatenate found file onto path
+    wxString path(wxPathOnly(gs_strFileSpec));
+    if ( !path.IsEmpty() )
+        result << path << wxT('\\');
+
+    int flag = _A_NORMAL;
+    if (flags & wxDIR)
+        flag = _A_SUBDIR;

 
 

+    if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0)
+    {
+        char attrib;
+        attrib = gs_findDataStruct.attrib;
+
+        if (attrib & _A_SUBDIR) {
+            if (!(gs_findFlags & wxDIR))
+                return wxFindNextFile();
+        } else if (gs_findFlags && !(gs_findFlags & wxFILE))
+            return wxFindNextFile();
+
+        result += gs_findDataStruct.name;
+    }
+    */

     return result;
 }
 
     return result;
 }
 

-#endif // Unix/Windows
+wxString wxFindNextFile()
+{
+    wxString result;
+    // TODO:
+    return result;
+}
+
+#endif // Unix/Windows/OS/2

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


@@ -1609,16 +1684,16 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
 #ifdef _MSC_VER
   if (_getcwd(cbuf, sz) == NULL) {
 #elif defined( __WXMAC__)
 #ifdef _MSC_VER
   if (_getcwd(cbuf, sz) == NULL) {
 #elif defined( __WXMAC__)

-       enum
-       {
-               SFSaveDisk = 0x214, CurDirStore = 0x398
-       };
-       FSSpec cwdSpec ;
-       
-       FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
-       wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
-       strcpy( buf , res ) ;
-       if (0) {
+    enum
+    {
+        SFSaveDisk = 0x214, CurDirStore = 0x398
+    };
+    FSSpec cwdSpec ;
+
+    FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
+    wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+    strcpy( buf , res ) ;
+    if (0) {

 #else
   if (getcwd(cbuf, sz) == NULL) {
 #endif
 #else
   if (getcwd(cbuf, sz) == NULL) {
 #endif


@@ -1627,16 +1702,23 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {
 #elif defined( __WXMAC__)
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {
 #elif defined( __WXMAC__)

-       enum 
-       { 
-               SFSaveDisk = 0x214, CurDirStore = 0x398 
-       };
-       FSSpec cwdSpec ;
-       
-       FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
-       wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
-       strcpy( buf , res ) ;
-       if (0) {
+    enum
+    {
+        SFSaveDisk = 0x214, CurDirStore = 0x398
+    };
+    FSSpec cwdSpec ;
+
+    FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
+    wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+    strcpy( buf , res ) ;
+    if (0) {
+#elif(__VISAGECPP__)
+    APIRET rc;
+    rc = ::DosQueryCurrentDir( 0 // current drive
+                              ,buf
+                              ,(PULONG)&sz
+                             );
+    if (rc != 0) {

 #else
   if (getcwd(buf, sz) == NULL) {
 #endif
 #else
   if (getcwd(buf, sz) == NULL) {
 #endif


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

-#if defined( __UNIX__ ) || defined( __WXMAC__ ) || defined(__WXPM__)
+#if defined( __UNIX__ ) || defined( __WXMAC__ )

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

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

 #elif defined(__WINDOWS__)
 
 #ifdef __WIN32__
 #elif defined(__WINDOWS__)
 
 #ifdef __WIN32__


@@ -1726,7 +1810,7 @@ bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFi
 {
     // we assume that it's not empty
     wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE,
 {
     // we assume that it's not empty
     wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE,

-            _("empty file name in wxFindFileInPath"));
+                 _T("empty file name in wxFindFileInPath"));

 
     // skip path separator in the beginning of the file name if present
     if ( wxIsPathSeparator(*pszFile) )
 
     // skip path separator in the beginning of the file name if present
     if ( wxIsPathSeparator(*pszFile) )


@@ -1823,13 +1907,11 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
     }
 }
 
     }
 }
 

-
-

 time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
 {
 time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
 {

-    struct stat buf;
+    wxStructStat buf;

 
 

-    stat(filename.fn_str(), &buf);
+    wxStat(filename.fn_str(), &buf);

     return buf.st_mtime;
 }
 
     return buf.st_mtime;
 }