fixed bug with the caret positioning after SetValue() introduced by the last commit

[wxWidgets.git] / include / wx / filefn.h

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 777973aabd9b496df97158bfcdf705efd3bc19bd..e076faacfc63381541ebb63643f03a9fee6ce0b7 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -16,14 +16,16 @@
     #pragma interface "filefn.h"
 #endif
 
     #pragma interface "filefn.h"
 #endif
 

-#include <wx/list.h>
+#include "wx/list.h"
+
+#include <time.h>

 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 // define off_t
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 // define off_t

-#ifndef __WXMAC__
+#if !defined(__WXMAC__) || defined(__UNIX__)

     #include  <sys/types.h>
 #else
     typedef long off_t;
     #include  <sys/types.h>
 #else
     typedef long off_t;


@@ -39,7 +41,15 @@
     typedef long off_t;
 #endif
 
     typedef long off_t;
 #endif
 

+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+//
+// VisualAge C++ V4.0 cannot have any external linkage const decs
+// in headers included by more than one primary source
+//
+extern const off_t wxInvalidOffset;
+#else

 const off_t wxInvalidOffset = (off_t)-1;
 const off_t wxInvalidOffset = (off_t)-1;

+#endif

 
 enum wxSeekMode
 {
 
 enum wxSeekMode
 {


@@ -48,7 +58,83 @@ enum wxSeekMode
   wxFromEnd
 };
 
   wxFromEnd
 };
 

-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+
+// ----------------------------------------------------------------------------
+// declare our versions of low level file functions: some compilers prepend
+// underscores to the usual names, some also have Unicode versions of them
+// ----------------------------------------------------------------------------
+
+// Microsoft compiler loves underscores, feed them to it
+#if defined( __VISUALC__ ) \
+    || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
+    // functions
+    #define   wxClose      _close
+    #define   wxRead       _read
+    #define   wxWrite      _write
+    #define   wxLseek      _lseek
+    #define   wxFsync      _commit
+    #define   wxEof        _eof
+
+    #define   wxTell       _tell
+
+    #if wxUSE_UNICODE
+        #define   wxOpen       _wopen
+        #define   wxAccess     _waccess
+
+        #define   wxMkDir      _wmkdir
+        #define   wxRmDir      _wrmdir
+
+        #define   wxStat       _wstat
+    #else // !wxUSE_UNICODE
+        #define   wxOpen       _open
+        #define   wxAccess     _access
+
+        #define   wxMkDir      _mkdir
+        #define   wxRmDir      _rmdir
+
+        #define   wxStat       _stat
+    #endif
+
+    // types
+    #define   wxStructStat struct _stat
+
+    // constants (unless already defined by the user code)
+    #ifndef O_RDONLY
+        #define   O_RDONLY    _O_RDONLY
+        #define   O_WRONLY    _O_WRONLY
+        #define   O_RDWR      _O_RDWR
+        #define   O_EXCL      _O_EXCL
+        #define   O_CREAT     _O_CREAT
+        #define   O_BINARY    _O_BINARY
+
+        #define   S_IFMT      _S_IFMT
+        #define   S_IFDIR     _S_IFDIR
+        #define   S_IFREG     _S_IFREG
+    #endif // O_RDONLY
+#else
+    // functions
+    #define   wxOpen       open
+    #define   wxClose      close
+    #define   wxRead       read
+    #define   wxWrite      write
+    #define   wxLseek      lseek
+    #define   wxFsync      commit
+    #define   wxAccess     access
+    #define   wxEof        eof
+
+    #define   wxMkDir      mkdir
+    #define   wxRmDir      rmdir
+
+    #define   wxTell(fd)   lseek(fd, 0, SEEK_CUR)
+
+    #define   wxStat       stat
+
+    // types
+    #define   wxStructStat struct stat
+
+#endif  // VC++

 
 // ----------------------------------------------------------------------------
 // functions
 
 // ----------------------------------------------------------------------------
 // functions


@@ -57,7 +143,7 @@ WXDLLEXPORT bool wxFileExists(const wxString& filename);
 #define FileExists wxFileExists
 
 // does the path exist? (may have or not '/' or '\\' at the end)
 #define FileExists wxFileExists
 
 // does the path exist? (may have or not '/' or '\\' at the end)

-WXDLLEXPORT bool wxPathExists(const char *pszPathName);
+WXDLLEXPORT bool wxPathExists(const wxChar *pszPathName);

 
 #define wxDirExists wxPathExists
 #define DirExists wxDirExists
 
 #define wxDirExists wxPathExists
 #define DirExists wxDirExists


@@ -66,7 +152,7 @@ WXDLLEXPORT bool wxIsAbsolutePath(const wxString& filename);
 #define IsAbsolutePath wxIsAbsolutePath
 
 // Get filename
 #define IsAbsolutePath wxIsAbsolutePath
 
 // Get filename

-WXDLLEXPORT char* wxFileNameFromPath(char *path);
+WXDLLEXPORT wxChar* wxFileNameFromPath(wxChar *path);

 WXDLLEXPORT wxString wxFileNameFromPath(const wxString& path);
 #define FileNameFromPath wxFileNameFromPath
 
 WXDLLEXPORT wxString wxFileNameFromPath(const wxString& path);
 #define FileNameFromPath wxFileNameFromPath
 


@@ -77,46 +163,54 @@ WXDLLEXPORT wxString wxPathOnly(const wxString& path);
 // wxString version
 WXDLLEXPORT wxString wxRealPath(const wxString& path);
 
 // wxString version
 WXDLLEXPORT wxString wxRealPath(const wxString& path);
 

-WXDLLEXPORT void wxDos2UnixFilename(char *s);
+WXDLLEXPORT void wxDos2UnixFilename(wxChar *s);

 #define Dos2UnixFilename wxDos2UnixFilename
 
 #define Dos2UnixFilename wxDos2UnixFilename
 

-WXDLLEXPORT void wxUnix2DosFilename(char *s);
+WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);

 #define Unix2DosFilename wxUnix2DosFilename
 
 #ifdef __WXMAC__
 #define Unix2DosFilename wxUnix2DosFilename
 
 #ifdef __WXMAC__

-  WXDLLEXPORT void wxMacPathToFSSpec( const char *path , FSSpec *spec ) ;
-  WXDLLEXPORT void wxMac2UnixFilename(char *s);
-  WXDLLEXPORT void wxUnix2MacFilename(char *s);
+WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
+WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
+#  ifndef __DARWIN__
+// Mac file names are POSIX (Unix style) under Darwin, so these are not needed
+WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
+WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
+WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;
+WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);
+#  endif

 #endif
 
 // Strip the extension, in situ
 #endif
 
 // Strip the extension, in situ

-WXDLLEXPORT void wxStripExtension(char *buffer);
+WXDLLEXPORT void wxStripExtension(wxChar *buffer);

 WXDLLEXPORT void wxStripExtension(wxString& buffer);
 
 WXDLLEXPORT void wxStripExtension(wxString& buffer);
 

-// Get a temporary filename, opening and closing the file.
-WXDLLEXPORT char* wxGetTempFileName(const wxString& prefix, char *buf = (char *) NULL);
+// Get a temporary filename
+WXDLLEXPORT wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = (wxChar *) NULL);
+WXDLLEXPORT bool wxGetTempFileName(const wxString& prefix, wxString& buf);

 
 // Expand file name (~/ and ${OPENWINHOME}/ stuff)
 
 // Expand file name (~/ and ${OPENWINHOME}/ stuff)

-WXDLLEXPORT char* wxExpandPath(char *dest, const char *path);
+WXDLLEXPORT wxChar* wxExpandPath(wxChar *dest, const wxChar *path);
+WXDLLEXPORT bool wxExpandPath(wxString& dest, const wxChar *path);

 
 // Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
 // and make (if under the home tree) relative to home
 // [caller must copy-- volatile]
 
 // Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
 // and make (if under the home tree) relative to home
 // [caller must copy-- volatile]

-WXDLLEXPORT char* wxContractPath(const wxString& filename,
-                                 const wxString& envname = wxEmptyString,
-                                 const wxString& user = wxEmptyString);
+WXDLLEXPORT wxChar* wxContractPath(const wxString& filename,
+                                   const wxString& envname = wxEmptyString,
+                                   const wxString& user = wxEmptyString);

 
 // Destructive removal of /./ and /../ stuff
 
 // Destructive removal of /./ and /../ stuff

-WXDLLEXPORT char* wxRealPath(char *path);
+WXDLLEXPORT wxChar* wxRealPath(wxChar *path);

 
 // Allocate a copy of the full absolute path
 
 // Allocate a copy of the full absolute path

-WXDLLEXPORT char* wxCopyAbsolutePath(const wxString& path);
+WXDLLEXPORT wxChar* wxCopyAbsolutePath(const wxString& path);

 
 // Get first file name matching given wild card.
 // Flags are reserved for future use.
 #define wxFILE  1
 #define wxDIR   2
 
 // Get first file name matching given wild card.
 // Flags are reserved for future use.
 #define wxFILE  1
 #define wxDIR   2

-WXDLLEXPORT wxString wxFindFirstFile(const char *spec, int flags = wxFILE);
+WXDLLEXPORT wxString wxFindFirstFile(const wxChar *spec, int flags = wxFILE);

 WXDLLEXPORT wxString wxFindNextFile();
 
 // Does the pattern contain wildcards?
 WXDLLEXPORT wxString wxFindNextFile();
 
 // Does the pattern contain wildcards?


@@ -131,7 +225,8 @@ WXDLLEXPORT bool wxMatchWild(const wxString& pattern,  const wxString& text, boo
 WXDLLEXPORT bool wxConcatFiles(const wxString& file1, const wxString& file2, const wxString& file3);
 
 // Copy file1 to file2
 WXDLLEXPORT bool wxConcatFiles(const wxString& file1, const wxString& file2, const wxString& file3);
 
 // Copy file1 to file2

-WXDLLEXPORT bool wxCopyFile(const wxString& file1, const wxString& file2);
+WXDLLEXPORT bool wxCopyFile(const wxString& file1, const wxString& file2,
+                            bool overwrite = TRUE);

 
 // Remove file
 WXDLLEXPORT bool wxRemoveFile(const wxString& file);
 
 // Remove file
 WXDLLEXPORT bool wxRemoveFile(const wxString& file);


@@ -144,7 +239,7 @@ WXDLLEXPORT bool wxRenameFile(const wxString& file1, const wxString& file2);
 // copies into buf.
 // IMPORTANT NOTE getcwd is know not to work under some releases
 // of Win32s 1.3, according to MS release notes!
 // copies into buf.
 // IMPORTANT NOTE getcwd is know not to work under some releases
 // of Win32s 1.3, according to MS release notes!

-WXDLLEXPORT char* wxGetWorkingDirectory(char *buf = (char *) NULL, int sz = 1000);
+WXDLLEXPORT wxChar* wxGetWorkingDirectory(wxChar *buf = (wxChar *) NULL, int sz = 1000);

 // new and preferred version of wxGetWorkingDirectory
 // NB: can't have the same name because of overloading ambiguity
 WXDLLEXPORT wxString wxGetCwd();
 // new and preferred version of wxGetWorkingDirectory
 // NB: can't have the same name because of overloading ambiguity
 WXDLLEXPORT wxString wxGetCwd();


@@ -153,60 +248,79 @@ WXDLLEXPORT wxString wxGetCwd();
 WXDLLEXPORT bool wxSetWorkingDirectory(const wxString& d);
 
 // Make directory
 WXDLLEXPORT bool wxSetWorkingDirectory(const wxString& d);
 
 // Make directory

-WXDLLEXPORT bool wxMkdir(const wxString& dir);
+WXDLLEXPORT bool wxMkdir(const wxString& dir, int perm = 0777);

 
 // Remove directory. Flags reserved for future use.
 WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 
 
 // Remove directory. Flags reserved for future use.
 WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 

+// ----------------------------------------------------------------------------

 // separators in file names
 // separators in file names

-#define wxFILE_SEP_EXT        '.'
-#define wxFILE_SEP_DSK        ':'
-#define wxFILE_SEP_PATH_DOS   '\\'
-#define wxFILE_SEP_PATH_UNIX  '/'
+// ----------------------------------------------------------------------------
+
+// between file name and extension
+#define wxFILE_SEP_EXT        wxT('.')
+
+// between drive/volume name and the path
+#define wxFILE_SEP_DSK        wxT(':')
+
+// between the path components
+#define wxFILE_SEP_PATH_DOS   wxT('\\')
+#define wxFILE_SEP_PATH_UNIX  wxT('/')
+#define wxFILE_SEP_PATH_MAC   wxT(':')
+#define wxFILE_SEP_PATH_VMS   wxT('.') // VMS also uses '[' and ']'

 
 // separator in the path list (as in PATH environment variable)
 
 // separator in the path list (as in PATH environment variable)

+// there is no PATH variable in Classic Mac OS so just use the
+// semicolon (it must be different from the file name separator)

 // NB: these are strings and not characters on purpose!
 // NB: these are strings and not characters on purpose!

-#define wxPATH_SEP_DOS        ";"
-#define wxPATH_SEP_UNIX       ":"
+#define wxPATH_SEP_DOS        wxT(";")
+#define wxPATH_SEP_UNIX       wxT(":")
+#define wxPATH_SEP_MAC        wxT(";")

 
 // platform independent versions
 
 // platform independent versions

-#ifdef  __UNIX__
+#if defined(__UNIX__)

   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_UNIX
   #define wxPATH_SEP          wxPATH_SEP_UNIX
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_UNIX
   #define wxPATH_SEP          wxPATH_SEP_UNIX

-#else   // Windows
+#elif defined(__MAC__)
+  #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_MAC
+  #define wxPATH_SEP          wxPATH_SEP_MAC
+#else   // Windows and OS/2

   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
   #define wxPATH_SEP          wxPATH_SEP_DOS
 #endif  // Unix/Windows
 
 // this is useful for wxString::IsSameAs(): to compare two file names use
 // filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE)
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
   #define wxPATH_SEP          wxPATH_SEP_DOS
 #endif  // Unix/Windows
 
 // this is useful for wxString::IsSameAs(): to compare two file names use
 // filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE)

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

   #define wxARE_FILENAMES_CASE_SENSITIVE  TRUE
   #define wxARE_FILENAMES_CASE_SENSITIVE  TRUE

-#else   // Windows
+#else   // Windows, Mac OS and OS/2

   #define wxARE_FILENAMES_CASE_SENSITIVE  FALSE
 #endif  // Unix/Windows
 
 // is the char a path separator?
   #define wxARE_FILENAMES_CASE_SENSITIVE  FALSE
 #endif  // Unix/Windows
 
 // is the char a path separator?

-inline bool wxIsPathSeparator(char c)
+inline bool wxIsPathSeparator(wxChar c)

   { return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX; }
 
 // does the string ends with path separator?
   { return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX; }
 
 // does the string ends with path separator?

-WXDLLEXPORT bool wxEndsWithPathSeparator(const char *pszFileName);
+WXDLLEXPORT bool wxEndsWithPathSeparator(const wxChar *pszFileName);

 
 // split the full path into path (including drive for DOS), name and extension
 // (understands both '/' and '\\')
 
 // split the full path into path (including drive for DOS), name and extension
 // (understands both '/' and '\\')

-WXDLLEXPORT void wxSplitPath(const char *pszFileName,
+WXDLLEXPORT void wxSplitPath(const wxChar *pszFileName,

                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt);
 
 // find a file in a list of directories, returns false if not found
                              wxString *pstrPath,
                              wxString *pstrName,
                              wxString *pstrExt);
 
 // find a file in a list of directories, returns false if not found

-WXDLLEXPORT bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile);
+WXDLLEXPORT bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile);

 
 // Get the OS directory if appropriate (such as the Windows directory).
 // On non-Windows platform, probably just return the empty string.
 WXDLLEXPORT wxString wxGetOSDirectory();
 
 
 // Get the OS directory if appropriate (such as the Windows directory).
 // On non-Windows platform, probably just return the empty string.
 WXDLLEXPORT wxString wxGetOSDirectory();
 

+// Get file modification time
+WXDLLEXPORT time_t wxFileModificationTime(const wxString& filename);
+

 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------


@@ -220,7 +334,7 @@ public:
 
     void Add(const wxString& path);
     // Avoid compiler warning
 
     void Add(const wxString& path);
     // Avoid compiler warning

-    wxNode *Add(const char *s) { return wxStringList::Add(s); }
+    wxNode *Add(const wxChar *s) { return wxStringList::Add(s); }

     // Find the first full path for which the file exists
     wxString FindValidPath(const wxString& filename);
     // Find the first full path for which the file exists; ensure it's an
     // Find the first full path for which the file exists
     wxString FindValidPath(const wxString& filename);
     // Find the first full path for which the file exists; ensure it's an


@@ -237,4 +351,3 @@ private:
 
 #endif
   // _WX_FILEFN_H_
 
 #endif
   // _WX_FILEFN_H_

-