icon support moved to wxBitmap, allowing for fully transparent usage

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 721448750dbce5dc51178799de807bbc3edada02..1119b7f46ac090a7c6fb79f2c0a911be6a034530 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -57,6 +57,7 @@
 #else
     #include <stat.h>
     #include <unistd.h>
 #else
     #include <stat.h>
     #include <unistd.h>

+    #include <unix.h>

 #endif
 
 #ifdef __UNIX__
 #endif
 
 #ifdef __UNIX__


@@ -113,11 +114,11 @@
 
 extern wxChar *wxBuffer;
 
 
 extern wxChar *wxBuffer;
 

-#ifdef __WXMAC__
-#include "morefile.h"
-#include "moreextr.h"
-#include "fullpath.h"
-#include "fspcompa.h"
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    #include "morefile.h"
+    #include "moreextr.h"
+    #include "fullpath.h"
+    #include "fspcompa.h"

 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)


@@ -443,7 +444,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
 {
     register wxChar *d, *s, *nm;
     wxChar          lnm[_MAXPATHLEN];
 {
     register wxChar *d, *s, *nm;
     wxChar          lnm[_MAXPATHLEN];

-    int                                q;
+    int             q;

 
     // Some compilers don't like this line.
 //    const wxChar    trimchars[] = wxT("\n \t");
 
     // Some compilers don't like this line.
 //    const wxChar    trimchars[] = wxT("\n \t");


@@ -499,7 +500,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
       }
       else
 #else
       }
       else
 #else

-    while ((*d++ = *s)) {
+    while ((*d++ = *s) != 0) {

 #  ifndef __WXMSW__
         if (*s == wxT('\\')) {
             if ((*(d - 1) = *++s)) {
 #  ifndef __WXMSW__
         if (*s == wxT('\\')) {
             if ((*(d - 1) = *++s)) {


@@ -519,13 +520,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             register wxChar  *start = d;
             register int     braces = (*s == wxT('{') || *s == wxT('('));
             register wxChar  *value;
             register wxChar  *start = d;
             register int     braces = (*s == wxT('{') || *s == wxT('('));
             register wxChar  *value;

-#ifdef __VISAGECPP__
-    // VA gives assignment in logical expr warning
-            while (*d)
-               *d++ = *s;
-#else
-            while ((*d++ = *s))
-#endif
+            while ((*d++ = *s) != 0)

                 if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
                     break;
                 else
                 if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
                     break;
                 else


@@ -533,12 +528,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             *--d = 0;
             value = wxGetenv(braces ? start + 1 : start);
             if (value) {
             *--d = 0;
             value = wxGetenv(braces ? start + 1 : start);
             if (value) {

-#ifdef __VISAGECPP__
-    // VA gives assignment in logical expr warning
-                for ((d = start - 1); (*d); *d++ = *value++);
-#else
-                for ((d = start - 1); (*d++ = *value++););
-#endif
+                for ((d = start - 1); (*d++ = *value++) != 0;);

                 d--;
                 if (braces && *s)
                     s++;
                 d--;
                 if (braces && *s)
                     s++;


@@ -590,13 +580,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
           *(d - 1) = SEP;
     }
     s = nm;
           *(d - 1) = SEP;
     }
     s = nm;

-#ifdef __VISAGECPP__
-    // VA gives assignment in logical expr warning
-    while (*d)
-       *d++ = *s++;
-#else
-    while ((*d++ = *s++));
-#endif
+    while ((*d++ = *s++) != 0);

     delete[] nm_tmp; // clean up alloc
     /* Now clean up the buffer */
     return wxRealPath(buf);
     delete[] nm_tmp; // clean up alloc
     /* Now clean up the buffer */
     return wxRealPath(buf);


@@ -816,7 +800,7 @@ 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.
 

-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)

 
 static char sMacFileNameConversion[ 1000 ] ;
 
 
 static char sMacFileNameConversion[ 1000 ] ;
 


@@ -995,12 +979,19 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
 
 // Copy files
 bool
 
 // Copy files
 bool

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

 {
 {

+#if defined(__WIN32__)
+    // CopyFile() copies file attributes and modification time too, so use it
+    // instead of our code if available
+    //
+    // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
+    return ::CopyFile(file1, file2, !overwrite) != 0;
+#else // !Win32

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

-    if ( wxStat(file1, &fbuf) != 0 )
+    if ( wxStat(OS_FILENAME(file1), &fbuf) != 0 )

     {
         // the file probably doesn't exist or we haven't the rights to read
         // from it anyhow
     {
         // the file probably doesn't exist or we haven't the rights to read
         // from it anyhow


@@ -1016,7 +1007,7 @@ wxCopyFile (const wxString& file1, const wxString& file2)
 
     // 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

-    if ( wxFileExists(file2) && !wxRemoveFile(file2) )
+    if ( wxFileExists(file2)  && (!overwrite || !wxRemoveFile(file2)))

     {
         wxLogSysError(_("Impossible to overwrite the file '%s'"),
                       file2.c_str());
     {
         wxLogSysError(_("Impossible to overwrite the file '%s'"),
                       file2.c_str());


@@ -1032,7 +1023,7 @@ wxCopyFile (const wxString& file1, const wxString& file2)
     // create file2 with the same permissions than file1 and open it for
     // writing
     wxFile fileOut;
     // create file2 with the same permissions than file1 and open it for
     // writing
     wxFile fileOut;

-    if ( !fileOut.Create(file2, TRUE, fbuf.st_mode & 0777) )
+    if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )

         return FALSE;
 
 #ifdef __UNIX__
         return FALSE;
 
 #ifdef __UNIX__


@@ -1057,23 +1048,32 @@ wxCopyFile (const wxString& file1, const wxString& file2)
             return FALSE;
     }
 
             return FALSE;
     }
 

-#ifndef __VISAGECPP__
-// no chmod in VA.  SHould be some permission API for HPFS386 partitions however
-    if ( chmod(file2, fbuf.st_mode) != 0 )
+    // 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 !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
+    // no chmod in VA.  Should be some permission API for HPFS386 partitions
+    // however
+    if ( chmod(OS_FILENAME(file2), fbuf.st_mode) != 0 )

     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());
         return FALSE;
     }
     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());
         return FALSE;
     }

-#endif
+#endif // OS/2 || Mac
+

     return TRUE;
     return TRUE;

+#endif // __WXMSW__ && __WIN32__

 }
 
 bool
 wxRenameFile (const wxString& file1, const wxString& file2)
 {
   // Normal system call
 }
 
 bool
 wxRenameFile (const wxString& file1, const wxString& file2)
 {
   // Normal system call

-  if ( wxRename (OS_FILENAME(file1), OS_FILENAME(file2)) == 0 )
+  if ( wxRename (file1, file2) == 0 )

     return TRUE;
 
   // Try to copy
     return TRUE;
 
   // Try to copy


@@ -1098,7 +1098,7 @@ bool wxRemoveFile(const wxString& file)
 
 bool wxMkdir(const wxString& dir, int perm)
 {
 
 bool wxMkdir(const wxString& dir, int perm)
 {

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

   return (mkdir(wxUnix2MacFilename( dir ) , 0 ) == 0);
 #else // !Mac
     const wxChar *dirname = dir.c_str();
   return (mkdir(wxUnix2MacFilename( dir ) , 0 ) == 0);
 #else // !Mac
     const wxChar *dirname = dir.c_str();


@@ -1110,6 +1110,7 @@ bool wxMkdir(const wxString& dir, int perm)
 #elif defined(__WXPM__)
     if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
 #else  // !MSW and !OS/2 VAC++
 #elif defined(__WXPM__)
     if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
 #else  // !MSW and !OS/2 VAC++

+       (void)perm;

     if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
 #endif // !MSW/MSW
     {
     if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
 #endif // !MSW/MSW
     {


@@ -1663,7 +1664,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
   char *cbuf = new char[sz+1];
 #ifdef _MSC_VER
   if (_getcwd(cbuf, sz) == NULL) {
   char *cbuf = new char[sz+1];
 #ifdef _MSC_VER
   if (_getcwd(cbuf, sz) == NULL) {

-#elif defined( __WXMAC__)
+#elif defined(__WXMAC__) && !defined(__UNIX__)

     enum
     {
         SFSaveDisk = 0x214, CurDirStore = 0x398
     enum
     {
         SFSaveDisk = 0x214, CurDirStore = 0x398


@@ -1681,17 +1682,41 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
 #else // wxUnicode
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {
 #else // wxUnicode
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {

-#elif defined( __WXMAC__)
-    enum
-    {
-        SFSaveDisk = 0x214, CurDirStore = 0x398
-    };
-    FSSpec cwdSpec ;
-
-    FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ;
-    wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
-    strcpy( buf , res ) ;
-    if (0) {
+#elif defined(__WXMAC__) && !defined(__UNIX__)
+       FSSpec cwdSpec ;
+       FCBPBRec pb;
+       OSErr error;
+       Str255  fileName ;
+       pb.ioNamePtr = (StringPtr) &fileName;
+       pb.ioVRefNum = 0;
+       pb.ioRefNum = LMGetCurApRefNum();
+       pb.ioFCBIndx = 0;
+       error = PBGetFCBInfoSync(&pb);
+       if ( error == noErr )
+       {
+               cwdSpec.vRefNum = pb.ioFCBVRefNum;
+               cwdSpec.parID = pb.ioFCBParID;
+               cwdSpec.name[0] = 0 ;
+               wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+               
+               strcpy( buf , res ) ;
+               buf[res.length()-1]=0 ;
+       }
+       else
+               buf[0] = 0 ;
+       /*
+       this version will not always give back the application directory on mac
+       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
 #elif(__VISAGECPP__)
     APIRET rc;
     rc = ::DosQueryCurrentDir( 0 // current drive


@@ -1911,7 +1936,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
             pattern++;
             ret_code = FALSE;
             while ((*str!=wxT('\0'))
             pattern++;
             ret_code = FALSE;
             while ((*str!=wxT('\0'))

-            && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
+            && ((ret_code=wxMatchWild(pattern, str++, FALSE)) == 0))

                 /*loop*/;
             if (ret_code) {
                 while (*str != wxT('\0'))
                 /*loop*/;
             if (ret_code) {
                 while (*str != wxT('\0'))