Fixes to wxMotif scrolling and colours (wxTreeCtrl/wxListCtrl now seem to work

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index e5a12a873a70d23165d30378006743cf53a3dffa..b9c92f21f0c40b9fea38f4bef4ed93da811cedf6 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -29,6 +29,10 @@
   #define   off_t       _off_t
 #endif
 
+#if defined(__BORLANDC__) && defined(__WIN16__)
+typedef long off_t;
+#endif
+
 const off_t wxInvalidOffset = (off_t)-1;
 
 typedef enum {
@@ -37,6 +41,8 @@ typedef enum {
   wxFromEnd
 } wxSeekMode;
 
+WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+
 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------
@@ -85,7 +91,7 @@ WXDLLEXPORT char* wxExpandPath(char *dest, const char *path);
 // and make (if under the home tree) relative to home
 // [caller must copy-- volatile]
 WXDLLEXPORT char* wxContractPath (const wxString& filename,
-   const wxString& envname = "", const wxString& user = "");
+   const wxString& envname = wxEmptyString, const wxString& user = wxEmptyString);
 
 // Destructive removal of /./ and /../ stuff
 WXDLLEXPORT char* wxRealPath(char *path);
@@ -186,21 +192,22 @@ WXDLLEXPORT bool wxFindFileInPath(wxString *pStr, const char *pszPath, const cha
 // ----------------------------------------------------------------------------
 
 // Path searching
-class WXDLLEXPORT wxPathList: public wxStringList
+class WXDLLEXPORT wxPathList : public wxStringList
 {
-  DECLARE_DYNAMIC_CLASS(wxPathList)
-
-  public:
-  void AddEnvList(const wxString& envVariable);    // Adds all paths in environment variable
-  void Add(const wxString& path);
-  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
-                                         // for which the file exists; ensure it's an absolute
-                                         // path that gets returned.
-  void EnsureFileAccessible(const wxString& path); // Given full path and filename,
-                                         // add path to list
-  bool Member(const wxString& path);
+public:
+    void AddEnvList(const wxString& envVariable);    // Adds all paths in environment variable
+    void Add(const wxString& path);
+    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
+    // for which the file exists; ensure it's an absolute
+    // path that gets returned.
+    void EnsureFileAccessible(const wxString& path); // Given full path and filename,
+    // add path to list
+    bool Member(const wxString& path);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPathList)
 };
 
 #endif