add wxScrollHelper::ShowScrollbars() (implemented for GTK only right now, generic...

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index ff3dc70050b2096060951296f1cec0f5d3d2e436..24324f04ee045183612f2751498084b633197655 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -56,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__


@@ -96,8 +96,8 @@
     #define _MAXPATHLEN 1024
 #endif
 
     #define _MAXPATHLEN 1024
 #endif
 

-#ifdef __WXMAC__
-// #    include "MoreFilesX.h"
+#ifndef INVALID_FILE_ATTRIBUTES
+    #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -320,7 +320,7 @@ wxFileExists (const wxString& filename)
     // it can cope with network (UNC) paths unlike them
     DWORD ret = ::GetFileAttributes(filename.fn_str());
 
     // it can cope with network (UNC) paths unlike them
     DWORD ret = ::GetFileAttributes(filename.fn_str());
 

-    return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
+    return (ret != INVALID_FILE_ATTRIBUTES) && !(ret & FILE_ATTRIBUTE_DIRECTORY);

 #else // !__WIN32__
     #ifndef S_ISREG
         #define S_ISREG(mode) ((mode) & S_IFREG)
 #else // !__WIN32__
     #ifndef S_ISREG
         #define S_ISREG(mode) ((mode) & S_IFREG)


@@ -403,11 +403,9 @@ void wxStripExtension(wxString& buffer)
 template<typename CharType>
 static CharType *wxDoRealPath (CharType *path)
 {
 template<typename CharType>
 static CharType *wxDoRealPath (CharType *path)
 {

+  static const CharType SEP = wxFILE_SEP_PATH;

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-  static const CharType SEP = wxT('\\');

   wxUnix2DosFilename(path);
   wxUnix2DosFilename(path);

-#else
-  static const CharType SEP = wxT('/');

 #endif
   if (path[0] && path[1]) {
     /* MATTHEW: special case "/./x" */
 #endif
   if (path[0] && path[1]) {
     /* MATTHEW: special case "/./x" */


@@ -539,11 +537,11 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
     trimchars[2] = wxT('\t');
     trimchars[3] = 0;
 
     trimchars[2] = wxT('\t');
     trimchars[3] = 0;
 

+    static const CharType SEP = wxFILE_SEP_PATH;

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-    const CharType     SEP = wxT('\\');
-#else
-    const CharType     SEP = wxT('/');
+    //wxUnix2DosFilename(path);

 #endif
 #endif

+

     buf[0] = wxT('\0');
     if (name.empty())
         return buf;
     buf[0] = wxT('\0');
     if (name.empty())
         return buf;


@@ -880,7 +878,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.
 

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

 
 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 
 
 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 


@@ -900,13 +898,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 );


@@ -931,7 +929,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__


@@ -1345,7 +1343,7 @@ bool wxDirExists(const wxString& pathName)
     // stat() can't cope with network paths
     DWORD ret = ::GetFileAttributes(strPath.fn_str());
 
     // stat() can't cope with network paths
     DWORD ret = ::GetFileAttributes(strPath.fn_str());
 

-    return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
+    return (ret != INVALID_FILE_ATTRIBUTES) && (ret & FILE_ATTRIBUTE_DIRECTORY);

 #elif defined(__OS2__)
     FILESTATUS3 Info = {{0}};
     APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,
 #elif defined(__OS2__)
     FILESTATUS3 Info = {{0}};
     APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,


@@ -1375,7 +1373,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);
 


@@ -1409,8 +1412,7 @@ wxString wxFindFirstFile(const wxString& 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() )


@@ -1440,7 +1442,7 @@ wxString wxFindFirstFile(const wxString& 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);


@@ -1658,7 +1660,7 @@ 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;
     return wxMacFindFolder(kOnSystemDisk, 'macs', false);
 #else
     return wxEmptyString;


@@ -1703,7 +1705,7 @@ bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& sz
     return false;
 }
 
     return false;
 }
 

-void WXDLLEXPORT wxSplitPath(const wxString& fileName,
+void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,

                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt)
                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt)


@@ -1713,7 +1715,7 @@ void WXDLLEXPORT wxSplitPath(const wxString& fileName,
 
 #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) )


@@ -1729,7 +1731,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)
 {


@@ -1842,22 +1844,32 @@ static bool wxCheckWin32Permission(const wxString& path, DWORD access)
     // quoting the MSDN: "To obtain a handle to a directory, call the
     // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
     // doesn't work under Win9x/ME but then it's not needed there anyhow
     // quoting the MSDN: "To obtain a handle to a directory, call the
     // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
     // doesn't work under Win9x/ME but then it's not needed there anyhow

-    bool isdir = wxDirExists(path);
-    if ( isdir && wxGetOsVersion() == wxOS_WINDOWS_9X )
+    const DWORD dwAttr = ::GetFileAttributes(path.fn_str());
+    if ( dwAttr == INVALID_FILE_ATTRIBUTES )
+    {
+        // file probably doesn't exist at all
+        return false;
+    }
+
+    if ( wxGetOsVersion() == wxOS_WINDOWS_9X )

     {
         // FAT directories always allow all access, even if they have the
     {
         // FAT directories always allow all access, even if they have the

-        // readonly flag set
-        return true;
+        // readonly flag set, and FAT files can only be read-only
+        return (dwAttr & FILE_ATTRIBUTE_DIRECTORY) ||
+                    (access != GENERIC_WRITE ||
+                        !(dwAttr & FILE_ATTRIBUTE_READONLY));

     }
 
     HANDLE h = ::CreateFile
                  (
     }
 
     HANDLE h = ::CreateFile
                  (

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

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

-                    isdir ? FILE_FLAG_BACKUP_SEMANTICS : 0,
+                    dwAttr & FILE_ATTRIBUTE_DIRECTORY
+                        ? FILE_FLAG_BACKUP_SEMANTICS
+                        : 0,

                     NULL
                  );
     if ( h != INVALID_HANDLE_VALUE )
                     NULL
                  );
     if ( h != INVALID_HANDLE_VALUE )