Added Upper() and Lower() - return the copy of the string converted to upper

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 8131e55c3f906f6c4afe373e3daeb5a3a1fca041..3127f1c51e84f8c136fc2512a4c91f68c21d5c4c 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -23,7 +23,11 @@
 // ----------------------------------------------------------------------------
 
 // define off_t
+#ifndef __WXMAC__
 #include  <sys/types.h>
+#else
+typedef long off_t;
+#endif
 
 #ifdef    _MSC_VER
   #define   off_t       _off_t
@@ -33,6 +37,10 @@
 typedef long off_t;
 #endif
 
+#if defined(__SC__)
+typedef long off_t;
+#endif
+
 const off_t wxInvalidOffset = (off_t)-1;
 
 typedef enum {
@@ -41,6 +49,8 @@ typedef enum {
   wxFromEnd
 } wxSeekMode;
 
+WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+
 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------
@@ -75,6 +85,11 @@ WXDLLEXPORT void wxDos2UnixFilename(char *s);
 WXDLLEXPORT void wxUnix2DosFilename(char *s);
 #define Unix2DosFilename wxUnix2DosFilename
 
+#ifdef __WXMAC__
+  WXDLLEXPORT void wxMacPathToFSSpec( const char *path , FSSpec *spec ) ;
+  WXDLLEXPORT void wxMac2UnixFilename(char *s);
+  WXDLLEXPORT void wxUnix2MacFilename(char *s);
+#endif
 // Strip the extension, in situ
 WXDLLEXPORT void wxStripExtension(char *buffer);
 WXDLLEXPORT void wxStripExtension(wxString& buffer);
@@ -88,8 +103,9 @@ WXDLLEXPORT char* wxExpandPath(char *dest, const char *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]
-WXDLLEXPORT char* wxContractPath (const wxString& filename,
-   const wxString& envname = wxEmptyString, const wxString& user = wxEmptyString);
+WXDLLEXPORT char* wxContractPath(const wxString& filename,
+                                 const wxString& envname = "",
+                                 const wxString& user = "");
 
 // Destructive removal of /./ and /../ stuff
 WXDLLEXPORT char* wxRealPath(char *path);
@@ -194,7 +210,11 @@ class WXDLLEXPORT wxPathList : public wxStringList
 {
 public:
     void AddEnvList(const wxString& envVariable);    // Adds all paths in environment variable
+
     void Add(const wxString& path);
+    // Avoid compiler warning
+    wxNode *Add(const char *s) { return wxStringList::Add(s); }
+
     wxString FindValidPath(const wxString& filename);   // Find the first full path
     // for which the file exists
     wxString FindAbsoluteValidPath(const wxString& filename);   // Find the first full path