fix typo in drawing slider ticks; added assert to check for it (slightly modified...

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index bbce6d8de14362de945eb03ddccd47e7253b83ee..5c5dd58c9dc013ab000d42b0c1a17a0157fc07fa 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -71,8 +71,6 @@
     #endif
 #elif (defined(__WXPM__))
     #include <io.h>
-    #define   W_OK        2
-    #define   R_OK        4
 #elif (defined(__WXSTUBS__))
     // Have to ifdef this for different environments
     #include <io.h>
@@ -84,8 +82,6 @@
 #endif
     char* mktemp( char * path ) { return path ;}
     #include <stat.h>
-    #define   W_OK        2
-    #define   R_OK        4
     #include  <unistd.h>
 #else
     #error  "Please specify the header with file functions declarations."
@@ -94,18 +90,21 @@
 #include  <stdio.h>       // SEEK_xxx constants
 #include  <fcntl.h>       // O_RDONLY &c
 
-#ifndef __MWERKS__
-    #include  <sys/types.h>   // needed for stat
-    #include  <sys/stat.h>    // stat
-#elif ( defined(__MWERKS__) && defined(__WXMSW__) )
+#if !defined(__MWERKS__) || defined(__WXMSW__)
     #include  <sys/types.h>   // needed for stat
     #include  <sys/stat.h>    // stat
 #endif
 
-#if defined(__BORLANDC__) || defined(_MSC_VER)
-    #define   W_OK        2
-    #define   R_OK        4
-#endif
+// Windows compilers don't have these constants
+#ifndef W_OK
+    enum
+    {
+        F_OK = 0,   // test for existence
+        X_OK = 1,   //          execute permission
+        W_OK = 2,   //          write
+        R_OK = 4    //          read
+    };
+#endif // W_OK
 
 // there is no distinction between text and binary files under Unix, so define
 // O_BINARY as 0 if the system headers don't do it already
@@ -138,6 +137,11 @@
 
 #include  "wx/filename.h"
 #include  "wx/file.h"
+#include  "wx/filefn.h"
+
+#ifdef __WXMSW__
+    #include "wx/msw/mslu.h"
+#endif
 
 // ============================================================================
 // implementation of wxFile
@@ -146,28 +150,22 @@
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------
+
 bool wxFile::Exists(const wxChar *name)
 {
-    wxStructStat st;
-#if wxUSE_UNICODE && wxMBFILES
-    wxCharBuffer fname = wxConvFile.cWC2MB(name);
-
-    return !wxAccess(fname, 0) &&
-           !wxStat(wxMBSTRINGCAST fname, &st) &&
-           (st.st_mode & S_IFREG);
-
-#else
-    return !wxAccess(name, 0) &&
-           !wxStat(name, &st) &&
-           (st.st_mode & S_IFREG);
-#endif
+    return wxFileExists(name);
 }
 
 bool wxFile::Access(const wxChar *name, OpenMode mode)
 {
-    int how = 0;
+    int how;
+
+    switch ( mode )
+    {
+        default:
+            wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
+            // fall through
 
-    switch ( mode ) {
         case read:
             how = R_OK;
             break;
@@ -176,11 +174,12 @@ bool wxFile::Access(const wxChar *name, OpenMode mode)
             how = W_OK;
             break;
 
-        default:
-            wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
+        case read_write:
+            how = R_OK | W_OK;
+            break;
     }
 
-    return wxAccess(wxFNCONV(name), how) == 0;
+    return wxAccess(name, how) == 0;
 }
 
 // ----------------------------------------------------------------------------
@@ -202,20 +201,22 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists
 #if defined(__WXMAC__) && !defined(__UNIX__)
-  // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace
-  // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
-  int fd = creat( szFileName , accessMode);
+    // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace
+    // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+    int fd = creat( szFileName , accessMode);
 #else
-    int fd = wxOpen(wxFNCONV(szFileName),
-                    O_BINARY | O_WRONLY | O_CREAT |
-                    (bOverwrite ? O_TRUNC : O_EXCL)
-                    ACCESS(accessMode));
+    int fd = wxOpen( szFileName,
+                     O_BINARY | O_WRONLY | O_CREAT |
+                     (bOverwrite ? O_TRUNC : O_EXCL)
+                     ACCESS(accessMode) );
 #endif
-    if ( fd == -1 ) {
+    if ( fd == -1 )
+    {
         wxLogSysError(_("can't create file '%s'"), szFileName);
         return FALSE;
     }
-    else {
+    else
+    {
         Attach(fd);
         return TRUE;
     }
@@ -226,7 +227,8 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
 {
     int flags = O_BINARY;
 
-    switch ( mode ) {
+    switch ( mode )
+    {
         case read:
             flags |= O_RDONLY;
             break;
@@ -253,8 +255,9 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
             break;
     }
 
-    int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode));
-    if ( fd == -1 ) {
+    int fd = wxOpen( szFileName, flags ACCESS(accessMode));
+    if ( fd == -1 )
+    {
         wxLogSysError(_("can't open file '%s'"), szFileName);
         return FALSE;
     }
@@ -503,9 +506,9 @@ bool wxTempFile::Open(const wxString& strName)
 #ifdef __UNIX__
     // the temp file should have the same permissions as the original one
     mode_t mode;
-
+    
     wxStructStat st;
-    if ( stat(m_strName.fn_str(), &st) == 0 )
+    if ( stat( (const char*) m_strName.fn_str(), &st) == 0 )
     {
         mode = st.st_mode;
     }
@@ -518,7 +521,7 @@ bool wxTempFile::Open(const wxString& strName)
         umask(mask);
     }
 
-    if ( chmod(m_strTemp.mb_str(), mode) == -1 )
+    if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
     {
         wxLogSysError(_("Failed to set temporary file permissions"));
     }