Added 2 extra macros to handle all the flavours of wxInt64 :(

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

diff --git a/include/wx/filename.h b/include/wx/filename.h
index d652009ce76abc627bcd66bff1261c28ddef3991..95666dc2b9e7ba0ee0364dde751640e3af4acba2 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -129,8 +129,7 @@ public:
         Assign(_T(""), path, name, ext, format);
     }
 
         Assign(_T(""), path, name, ext, format);
     }
 

-    void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE)
-        { Assign(dir, _T(""), format); }
+    void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE);

 
         // assorted assignment operators
 
 
         // assorted assignment operators
 


@@ -190,8 +189,8 @@ public:
     // various file/dir operations
 
         // retrieve the value of the current working directory
     // various file/dir operations
 
         // retrieve the value of the current working directory

-    void AssignCwd();
-    static wxString GetCwd();
+    void AssignCwd(const wxString& volume = wxEmptyString);
+    static wxString GetCwd(const wxString& volume = wxEmptyString);

 
         // change the current working directory
     bool SetCwd();
 
         // change the current working directory
     bool SetCwd();


@@ -322,10 +321,7 @@ public:
                           wxString *path,
                           wxString *name,
                           wxString *ext,
                           wxString *path,
                           wxString *name,
                           wxString *ext,

-                          wxPathFormat format = wxPATH_NATIVE)
-    {
-        SplitPath(fullpath, NULL, path, name, ext, format);
-    }
+                          wxPathFormat format = wxPATH_NATIVE);

 
 private:
     // the drive/volume/device specification (always empty for Unix)
 
 private:
     // the drive/volume/device specification (always empty for Unix)