Work on streams of all sorts. More to come.

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 777973aabd9b496df97158bfcdf705efd3bc19bd..22db00222bfefd7df862f4307f70dffe8cd4f36d 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -48,7 +48,7 @@ enum wxSeekMode
   wxFromEnd
 };
 
   wxFromEnd
 };
 

-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

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


@@ -57,7 +57,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 +66,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 +77,46 @@ 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 void wxMacPathToFSSpec( const wxChar *path , FSSpec *spec ) ;
+  WXDLLEXPORT void wxMac2UnixFilename(wxChar *s);
+  WXDLLEXPORT void wxUnix2MacFilename(wxChar *s);

 #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);
 
 // Get a temporary filename, opening and closing the file.
 WXDLLEXPORT void wxStripExtension(wxString& buffer);
 
 // Get a temporary filename, opening and closing the file.

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

 
 // 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);

 
 // 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?


@@ -144,7 +144,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,21 +153,21 @@ 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);
 
 // separators in file names
 
 // Remove directory. Flags reserved for future use.
 WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 
 // separators in file names

-#define wxFILE_SEP_EXT        '.'
-#define wxFILE_SEP_DSK        ':'
-#define wxFILE_SEP_PATH_DOS   '\\'
-#define wxFILE_SEP_PATH_UNIX  '/'
+#define wxFILE_SEP_EXT        _T('.')
+#define wxFILE_SEP_DSK        _T(':')
+#define wxFILE_SEP_PATH_DOS   _T('\\')
+#define wxFILE_SEP_PATH_UNIX  _T('/')

 
 // separator in the path list (as in PATH environment variable)
 // NB: these are strings and not characters on purpose!
 
 // separator in the path list (as in PATH environment variable)
 // NB: these are strings and not characters on purpose!

-#define wxPATH_SEP_DOS        ";"
-#define wxPATH_SEP_UNIX       ":"
+#define wxPATH_SEP_DOS        _T(";")
+#define wxPATH_SEP_UNIX       _T(":")

 
 // platform independent versions
 #ifdef  __UNIX__
 
 // platform independent versions
 #ifdef  __UNIX__


@@ -187,21 +187,21 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 #endif  // Unix/Windows
 
 // is the char a path separator?
 #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.
 
 // Get the OS directory if appropriate (such as the Windows directory).
 // On non-Windows platform, probably just return the empty string.


@@ -220,7 +220,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 +237,3 @@ private:
 
 #endif
   // _WX_FILEFN_H_
 
 #endif
   // _WX_FILEFN_H_

-