Update to Scintilla 1.53

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 42bc28cd000e7d608c24ff133d078322622180d5..3f00a7404ff97d698e934ce2c27af2a647946963 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -41,7 +41,7 @@
     typedef _off_t off_t;
 #elif defined(__BORLANDC__) && defined(__WIN16__)
     typedef long off_t;
     typedef _off_t off_t;
 #elif defined(__BORLANDC__) && defined(__WIN16__)
     typedef long off_t;

-#elif defined(__SC__)
+#elif defined(__SYMANTEC__)

     typedef long off_t;
 #elif defined(__MWERKS__) && !defined(__INTEL__) && !defined(__MACH__)
     typedef long off_t;
     typedef long off_t;
 #elif defined(__MWERKS__) && !defined(__INTEL__) && !defined(__MACH__)
     typedef long off_t;


@@ -66,8 +66,6 @@ enum wxSeekMode
   wxFromEnd
 };
 
   wxFromEnd
 };
 

-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
 // ----------------------------------------------------------------------------
 // declare our versions of low level file functions: some compilers prepend
 // underscores to the usual names, some also have Unicode versions of them


@@ -92,11 +90,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
     #if wxUSE_UNICODE
         #if wxUSE_UNICODE_MSLU
 
     #if wxUSE_UNICODE
         #if wxUSE_UNICODE_MSLU

-#ifdef __BORLANDC__
-            #define   wxOpen       open
-#else
-            #define   wxOpen       _open
-#endif 
+            #define   wxOpen       wxMSLU__wopen
+ 

             #define   wxAccess     wxMSLU__waccess
             #define   wxMkDir      wxMSLU__wmkdir
             #define   wxRmDir      wxMSLU__wrmdir
             #define   wxAccess     wxMSLU__waccess
             #define   wxMkDir      wxMSLU__wmkdir
             #define   wxRmDir      wxMSLU__wrmdir


@@ -109,7 +104,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
             #define   wxStat       _wstat
         #endif
     #else // !wxUSE_UNICODE
             #define   wxStat       _wstat
         #endif
     #else // !wxUSE_UNICODE

+#ifdef __BORLANDC__
+        #define   wxOpen       open
+#else

         #define   wxOpen       _open
         #define   wxOpen       _open

+#endif

         #define   wxAccess     _access
         #define   wxMkDir      _mkdir
         #define   wxRmDir      _rmdir
         #define   wxAccess     _access
         #define   wxMkDir      _mkdir
         #define   wxRmDir      _rmdir


@@ -155,112 +154,119 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 #if defined(__MWERKS__) && defined(macintosh)
        #include <sys/stat.h>
 #endif
 #if defined(__MWERKS__) && defined(macintosh)
        #include <sys/stat.h>
 #endif

-WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf );
-WXDLLEXPORT int wxAccess( const wxChar *pathname, int mode );
-WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode );
+WXDLLIMPEXP_BASE int wxStat( const wxChar *file_name, wxStructStat *buf );
+WXDLLIMPEXP_BASE int wxAccess( const wxChar *pathname, int mode );
+WXDLLIMPEXP_BASE int wxOpen( const wxChar *pathname, int flags, mode_t mode );
+#else
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+#include <sys/stat.h>
+WXDLLIMPEXP_BASE int wxStat( const wxChar *file_name, wxStructStat *buf );
+WXDLLIMPEXP_BASE int wxAccess( const wxChar *pathname, int mode );
+WXDLLIMPEXP_BASE int wxOpen( const wxChar *pathname, int flags, mode_t mode );

 #else
     #define   wxOpen       open
     #define   wxStat       stat
     #define   wxAccess     access
 #endif
 #else
     #define   wxOpen       open
     #define   wxStat       stat
     #define   wxAccess     access
 #endif

+#endif

 
 #endif  // VC++
 
 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------
 
 #endif  // VC++
 
 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------

-WXDLLEXPORT bool wxFileExists(const wxString& filename);
+WXDLLIMPEXP_BASE bool wxFileExists(const wxString& filename);

 
 // does the path exist? (may have or not '/' or '\\' at the end)
 
 // does the path exist? (may have or not '/' or '\\' at the end)

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

 
 

-WXDLLEXPORT bool wxIsAbsolutePath(const wxString& filename);
+WXDLLIMPEXP_BASE bool wxIsAbsolutePath(const wxString& filename);

 
 // Get filename
 
 // Get filename

-WXDLLEXPORT wxChar* wxFileNameFromPath(wxChar *path);
-WXDLLEXPORT wxString wxFileNameFromPath(const wxString& path);
+WXDLLIMPEXP_BASE wxChar* wxFileNameFromPath(wxChar *path);
+WXDLLIMPEXP_BASE wxString wxFileNameFromPath(const wxString& path);

 
 // Get directory
 
 // Get directory

-WXDLLEXPORT wxString wxPathOnly(const wxString& path);
+WXDLLIMPEXP_BASE wxString wxPathOnly(const wxString& path);

 
 // wxString version
 
 // wxString version

-WXDLLEXPORT wxString wxRealPath(const wxString& path);
+WXDLLIMPEXP_BASE wxString wxRealPath(const wxString& path);

 
 

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

 
 

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

 
 // Strip the extension, in situ
 
 // Strip the extension, in situ

-WXDLLEXPORT void wxStripExtension(wxChar *buffer);
-WXDLLEXPORT void wxStripExtension(wxString& buffer);
+WXDLLIMPEXP_BASE void wxStripExtension(wxChar *buffer);
+WXDLLIMPEXP_BASE void wxStripExtension(wxString& buffer);

 
 // Get a temporary filename
 
 // Get a temporary filename

-WXDLLEXPORT wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = (wxChar *) NULL);
-WXDLLEXPORT bool wxGetTempFileName(const wxString& prefix, wxString& buf);
+WXDLLIMPEXP_BASE wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = (wxChar *) NULL);
+WXDLLIMPEXP_BASE bool wxGetTempFileName(const wxString& prefix, wxString& buf);

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

-WXDLLEXPORT wxChar* wxExpandPath(wxChar *dest, const wxChar *path);
-WXDLLEXPORT bool wxExpandPath(wxString& dest, const wxChar *path);
+WXDLLIMPEXP_BASE wxChar* wxExpandPath(wxChar *dest, const wxChar *path);
+WXDLLIMPEXP_BASE 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 wxChar* wxContractPath(const wxString& filename,
+WXDLLIMPEXP_BASE wxChar* wxContractPath(const wxString& filename,

                                    const wxString& envname = wxEmptyString,
                                    const wxString& user = wxEmptyString);
 
 // Destructive removal of /./ and /../ stuff
                                    const wxString& envname = wxEmptyString,
                                    const wxString& user = wxEmptyString);
 
 // Destructive removal of /./ and /../ stuff

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

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

-WXDLLEXPORT wxChar* wxCopyAbsolutePath(const wxString& path);
+WXDLLIMPEXP_BASE 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 wxChar *spec, int flags = wxFILE);
-WXDLLEXPORT wxString wxFindNextFile();
+WXDLLIMPEXP_BASE wxString wxFindFirstFile(const wxChar *spec, int flags = wxFILE);
+WXDLLIMPEXP_BASE wxString wxFindNextFile();

 
 // Does the pattern contain wildcards?
 
 // Does the pattern contain wildcards?

-WXDLLEXPORT bool wxIsWild(const wxString& pattern);
+WXDLLIMPEXP_BASE bool wxIsWild(const wxString& pattern);

 
 // Does the pattern match the text (usually a filename)?
 // If dot_special is TRUE, doesn't match * against . (eliminating
 // `hidden' dot files)
 
 // Does the pattern match the text (usually a filename)?
 // If dot_special is TRUE, doesn't match * against . (eliminating
 // `hidden' dot files)

-WXDLLEXPORT bool wxMatchWild(const wxString& pattern,  const wxString& text, bool dot_special = TRUE);
+WXDLLIMPEXP_BASE bool wxMatchWild(const wxString& pattern,  const wxString& text, bool dot_special = TRUE);

 
 // Concatenate two files to form third
 
 // Concatenate two files to form third

-WXDLLEXPORT bool wxConcatFiles(const wxString& file1, const wxString& file2, const wxString& file3);
+WXDLLIMPEXP_BASE bool wxConcatFiles(const wxString& file1, const wxString& file2, const wxString& file3);

 
 // Copy file1 to file2
 
 // Copy file1 to file2

-WXDLLEXPORT bool wxCopyFile(const wxString& file1, const wxString& file2,
+WXDLLIMPEXP_BASE bool wxCopyFile(const wxString& file1, const wxString& file2,

                             bool overwrite = TRUE);
 
 // Remove file
                             bool overwrite = TRUE);
 
 // Remove file

-WXDLLEXPORT bool wxRemoveFile(const wxString& file);
+WXDLLIMPEXP_BASE bool wxRemoveFile(const wxString& file);

 
 // Rename file
 
 // Rename file

-WXDLLEXPORT bool wxRenameFile(const wxString& file1, const wxString& file2);
+WXDLLIMPEXP_BASE bool wxRenameFile(const wxString& file1, const wxString& file2);

 
 // Get current working directory.
 // If buf is NULL, allocates space using new, else
 // copies into buf.
 // IMPORTANT NOTE getcwd is know not to work under some releases
 // of Win32s 1.3, according to MS release notes!
 
 // Get current working directory.
 // If buf is NULL, allocates space using new, else
 // copies into buf.
 // IMPORTANT NOTE getcwd is know not to work under some releases
 // of Win32s 1.3, according to MS release notes!

-WXDLLEXPORT wxChar* wxGetWorkingDirectory(wxChar *buf = (wxChar *) NULL, int sz = 1000);
+WXDLLIMPEXP_BASE 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
 // new and preferred version of wxGetWorkingDirectory
 // NB: can't have the same name because of overloading ambiguity

-WXDLLEXPORT wxString wxGetCwd();
+WXDLLIMPEXP_BASE wxString wxGetCwd();

 
 // Set working directory
 
 // Set working directory

-WXDLLEXPORT bool wxSetWorkingDirectory(const wxString& d);
+WXDLLIMPEXP_BASE bool wxSetWorkingDirectory(const wxString& d);

 
 // Make directory
 
 // Make directory

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

 
 // Remove directory. Flags reserved for future use.
 
 // Remove directory. Flags reserved for future use.

-WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
+WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0);

 
 // compatibility defines, don't use in new code
 #define wxDirExists wxPathExists
 
 // compatibility defines, don't use in new code
 #define wxDirExists wxPathExists


@@ -334,39 +340,40 @@ inline bool wxIsPathSeparator(wxChar c)
 }
 
 // does the string ends with path separator?
 }
 
 // does the string ends with path separator?

-WXDLLEXPORT bool wxEndsWithPathSeparator(const wxChar *pszFileName);
+WXDLLIMPEXP_BASE 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 wxChar *pszFileName,
+WXDLLIMPEXP_BASE 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 wxChar *pszPath, const wxChar *pszFile);
+WXDLLIMPEXP_BASE 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.
 
 // Get the OS directory if appropriate (such as the Windows directory).
 // On non-Windows platform, probably just return the empty string.

-WXDLLEXPORT wxString wxGetOSDirectory();
+WXDLLIMPEXP_BASE wxString wxGetOSDirectory();

 
 // Get file modification time
 
 // Get file modification time

-WXDLLEXPORT time_t wxFileModificationTime(const wxString& filename);
+WXDLLIMPEXP_BASE time_t wxFileModificationTime(const wxString& filename);

 
 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------
 
 // Path searching
 
 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------
 
 // Path searching

-class WXDLLEXPORT wxPathList : public wxStringList
+class WXDLLIMPEXP_BASE wxPathList : public wxStringList

 {
 public:
 {
 public:

+    // avoid GCC warning about virtual functions w/o virtual dtor
+    virtual ~wxPathList() {}
+

     // Adds all paths in environment variable
     void AddEnvList(const wxString& envVariable);
 
     void Add(const wxString& path);
     // Adds all paths in environment variable
     void AddEnvList(const wxString& envVariable);
 
     void Add(const wxString& path);

-    // Avoid compiler warning
-    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


@@ -378,7 +385,7 @@ public:
     bool Member(const wxString& path);
 
 private:
     bool Member(const wxString& path);
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxPathList)
+    // DECLARE_DYNAMIC_CLASS(wxPathList)

 };
 
 #endif
 };
 
 #endif