Compilation fixes

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 37107533ad0c7868d7d092b353a05d1fe8396d84..7716488573f99eadfa32499b43bea7d5683413e8 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -43,8 +43,13 @@
 #endif
 #endif
 #include <time.h>
 #endif
 #endif
 #include <time.h>

+#ifndef __MWERKS__

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>

+#else
+#include <stat.h>
+#include <unistd.h>
+#endif

 
 #ifdef __UNIX__
 #include <unistd.h>
 
 #ifdef __UNIX__
 #include <unistd.h>


@@ -52,7 +57,7 @@
 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__

-#ifndef __GNUWIN32__
+#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ )

 #include <direct.h>
 #include <dos.h>
 #endif
 #include <direct.h>
 #include <dos.h>
 #endif


@@ -70,6 +75,7 @@
 #endif
 
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"

+#include "wx/log.h"

 
 // No, Cygwin doesn't appear to have fnmatch.h after all.
 #if defined(HAVE_FNMATCH_H)
 
 // No, Cygwin doesn't appear to have fnmatch.h after all.
 #if defined(HAVE_FNMATCH_H)


@@ -83,6 +89,11 @@
 #define _MAXPATHLEN 500
 
 extern char *wxBuffer;
 #define _MAXPATHLEN 500
 
 extern char *wxBuffer;

+#ifdef __WXMAC__
+extern char gwxMacFileName[] ;
+extern char gwxMacFileName2[] ;
+extern char gwxMacFileName3[] ;
+#endif

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)


@@ -142,7 +153,7 @@ bool wxPathList::Member (const wxString& path)
   {
       wxString path2((char *) node->Data ());
       if (
   {
       wxString path2((char *) node->Data ());
       if (

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

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


@@ -220,6 +231,13 @@ wxFileExists (const wxString& filename)
     return FALSE;
   else
     return TRUE;
     return FALSE;
   else
     return TRUE;

+#elif defined(__WXMAC__)
+       struct stat stbuf;
+       strcpy( gwxMacFileName , filename ) ;
+       wxUnix2MacFilename( gwxMacFileName ) ;
+       if (gwxMacFileName && stat ((char *)(const char *)gwxMacFileName, &stbuf) == 0)
+       return TRUE;
+    return FALSE ;

 #else
   struct stat stbuf;
 
 #else
   struct stat stbuf;
 


@@ -733,6 +751,58 @@ 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__
+void 
+wxMac2UnixFilename (char *s)
+{
+       if (s)
+       {
+               memmove( s+1 , s ,strlen( s ) + 1) ;
+               if ( *s == ':' )
+                       *s = '.' ;
+               else
+                       *s = '/' ;
+                       
+               while (*s)
+               {
+                       if (*s == ':')
+                         *s = '/';
+                       else
+                         *s = wxToLower (*s);  // Case INDEPENDENT
+                       s++;
+               }
+       }
+}
+
+void 
+wxUnix2MacFilename (char *s)
+{
+       if (s)
+       {
+               if ( *s == '.' )
+               {
+                       // relative path , since it goes on with slash which is translated to a : 
+                       memmove( s , s+1 ,strlen( s ) ) ;
+               }
+               else if ( *s == '/' )
+               {
+                       // absolute path -> on mac just start with the drive name
+                       memmove( s , s+1 ,strlen( s ) ) ;
+               }
+               else
+               {
+                       wxASSERT_MSG( 1 , "unkown path beginning" ) ;
+               }
+               while (*s)
+               {
+                       if (*s == '/' || *s == '\\')
+                               *s = ':';
+
+                       s++ ;
+               }
+       }
+}
+#endif

 void 
 wxDos2UnixFilename (char *s)
 {
 void 
 wxDos2UnixFilename (char *s)
 {


@@ -778,9 +848,22 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
   FILE *fp2 = (FILE *) NULL;
   FILE *fp3 = (FILE *) NULL;
   // Open the inputs and outputs
   FILE *fp2 = (FILE *) NULL;
   FILE *fp3 = (FILE *) NULL;
   // Open the inputs and outputs

+#ifdef __WXMAC__
+       strcpy( gwxMacFileName , file1 ) ;
+       wxUnix2MacFilename( gwxMacFileName ) ;
+       strcpy( gwxMacFileName2 , file2) ;
+       wxUnix2MacFilename( gwxMacFileName2 ) ;
+       strcpy( gwxMacFileName3 , outfile) ;
+       wxUnix2MacFilename( gwxMacFileName3 ) ;
+
+  if ((fp1 = fopen (gwxMacFileName, "rb")) == NULL ||
+      (fp2 = fopen (gwxMacFileName2, "rb")) == NULL ||
+      (fp3 = fopen (gwxMacFileName3, "wb")) == NULL)
+#else

   if ((fp1 = fopen (WXSTRINGCAST file1, "rb")) == NULL ||
       (fp2 = fopen (WXSTRINGCAST file2, "rb")) == NULL ||
       (fp3 = fopen (outfile, "wb")) == NULL)
   if ((fp1 = fopen (WXSTRINGCAST file1, "rb")) == NULL ||
       (fp2 = fopen (WXSTRINGCAST file2, "rb")) == NULL ||
       (fp3 = fopen (outfile, "wb")) == NULL)

+#endif

     {
       if (fp1)
        fclose (fp1);
     {
       if (fp1)
        fclose (fp1);


@@ -814,9 +897,20 @@ wxCopyFile (const wxString& file1, const wxString& file2)
   FILE *fd2;
   int ch;
 
   FILE *fd2;
   int ch;
 

+#ifdef __WXMAC__
+       strcpy( gwxMacFileName , file1 ) ;
+       wxUnix2MacFilename( gwxMacFileName ) ;
+       strcpy( gwxMacFileName2 , file2) ;
+       wxUnix2MacFilename( gwxMacFileName2 ) ;
+
+  if ((fd1 = fopen (gwxMacFileName, "rb")) == NULL)
+    return FALSE;
+  if ((fd2 = fopen (gwxMacFileName2, "wb")) == NULL)
+#else

   if ((fd1 = fopen (WXSTRINGCAST file1, "rb")) == NULL)
     return FALSE;
   if ((fd2 = fopen (WXSTRINGCAST file2, "wb")) == NULL)
   if ((fd1 = fopen (WXSTRINGCAST file1, "rb")) == NULL)
     return FALSE;
   if ((fd2 = fopen (WXSTRINGCAST file2, "wb")) == NULL)

+#endif

     {
       fclose (fd1);
       return FALSE;
     {
       fclose (fd1);
       return FALSE;


@@ -833,9 +927,19 @@ wxCopyFile (const wxString& file1, const wxString& file2)
 bool 
 wxRenameFile (const wxString& file1, const wxString& file2)
 {
 bool 
 wxRenameFile (const wxString& file1, const wxString& file2)
 {

+#ifdef __WXMAC__
+       strcpy( gwxMacFileName , file1 ) ;
+       wxUnix2MacFilename( gwxMacFileName ) ;
+       strcpy( gwxMacFileName2 , file2) ;
+       wxUnix2MacFilename( gwxMacFileName2 ) ;
+
+  if (0 == rename (gwxMacFileName, gwxMacFileName2))
+    return TRUE;
+#else

   // Normal system call
   if (0 == rename (WXSTRINGCAST file1, WXSTRINGCAST file2))
     return TRUE;
   // Normal system call
   if (0 == rename (WXSTRINGCAST file1, WXSTRINGCAST file2))
     return TRUE;

+#endif

   // Try to copy
   if (wxCopyFile(file1, file2)) {
     wxRemoveFile(file1);
   // Try to copy
   if (wxCopyFile(file1, file2)) {
     wxRemoveFile(file1);


@@ -849,6 +953,10 @@ bool wxRemoveFile(const wxString& file)
 {
 #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
   int flag = remove(WXSTRINGCAST file);
 {
 #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
   int flag = remove(WXSTRINGCAST file);

+#elif defined( __WXMAC__ )
+       strcpy( gwxMacFileName , file ) ;
+       wxUnix2MacFilename( gwxMacFileName ) ;
+  int flag = unlink(gwxMacFileName);

 #else
   int flag = unlink(WXSTRINGCAST file);
 #endif
 #else
   int flag = unlink(WXSTRINGCAST file);
 #endif


@@ -861,6 +969,10 @@ bool wxMkdir(const wxString& dir)
   return FALSE;
 #elif defined(__VMS__)
        return FALSE;
   return FALSE;
 #elif defined(__VMS__)
        return FALSE;

+#elif defined( __WXMAC__ )
+  strcpy( gwxMacFileName , dir ) ;
+  wxUnix2MacFilename( gwxMacFileName ) ;
+  return (mkdir(gwxMacFileName , 0 ) == 0);

 #elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)
   return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);
 #else
 #elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)
   return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);
 #else


@@ -872,6 +984,10 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #ifdef __VMS__
   return FALSE;
 {
 #ifdef __VMS__
   return FALSE;

+#elif defined( __WXMAC__ )
+       strcpy( gwxMacFileName , dir ) ;
+       wxUnix2MacFilename( gwxMacFileName ) ;
+  return (rmdir(WXSTRINGCAST gwxMacFileName) == 0);

 #else
   return (rmdir(WXSTRINGCAST dir) == 0);
 #endif
 #else
   return (rmdir(WXSTRINGCAST dir) == 0);
 #endif


@@ -976,7 +1092,7 @@ char *wxGetTempFileName(const wxString& prefix, char *buf)
          return buf;
        }
     }
          return buf;
        }
     }

-  cerr << _("wxWindows: error finding temporary file name.\n");
+  wxLogError( _("wxWindows: error finding temporary file name.\n") );

   if (buf) buf[0] = 0;
   return (char *) NULL;
 #endif
   if (buf) buf[0] = 0;
   return (char *) NULL;
 #endif


@@ -1260,7 +1376,7 @@ char *wxGetWorkingDirectory(char *buf, int sz)
 {
   if (!buf)
     buf = new char[sz+1];
 {
   if (!buf)
     buf = new char[sz+1];

-#ifdef _MSC_VER
+#ifdef _MSC_VER 

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


@@ -1273,7 +1389,7 @@ char *wxGetWorkingDirectory(char *buf, int sz)
 
 bool wxSetWorkingDirectory(const wxString& d)
 {
 
 bool wxSetWorkingDirectory(const wxString& d)
 {

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

   return (chdir(d) == 0);
 #elif defined(__WINDOWS__)
 
   return (chdir(d) == 0);
 #elif defined(__WINDOWS__)