added conversion to mac native filenames from local filesystem handler

[wxWidgets.git] / src / unix / dir.cpp

diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp
index 188e93c6e5e677f11bc1d5b443f47cbe1402632c..13b8d2a68a05becc2630de91a4735e7783d0913e 100644 (file)
--- a/src/unix/dir.cpp
+++ b/src/unix/dir.cpp
@@ -65,6 +65,8 @@ public:
     void Rewind() { rewinddir(m_dir); }
     bool Read(wxString *filename);
 
+    const wxString& GetName() const { return m_dirname; }
+
 private:
     DIR     *m_dir;
 
@@ -115,7 +117,7 @@ wxDirData::~wxDirData()
 
 bool wxDirData::Read(wxString *filename)
 {
-    dirent *de;
+    dirent *de = (dirent *)NULL;    // just to silent compiler warnings
     bool matches = FALSE;
 
     while ( !matches )
@@ -228,6 +230,22 @@ bool wxDir::IsOpened() const
     return m_data != NULL;
 }
 
+wxString wxDir::GetName() const
+{
+    wxString name;
+    if ( m_data )
+    {
+        name = M_DIR->GetName();
+        if ( !name.empty() && (name.Last() == _T('/')) )
+        {
+            // chop off the last (back)slash
+            name.Truncate(name.length() - 1);
+        }
+    }
+
+    return name;
+}
+
 wxDir::~wxDir()
 {
     delete M_DIR;