X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9f7896861f734ce044ee8601ba2d8a6959c9d9e..fcdd53359135f790b85728c4254b97095a56dad8:/src/msw/dir.cpp

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index bfca51b322..1bdeb321f7 100644
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -62,7 +62,7 @@ static inline void FreeFindData(FIND_DATA fd)
 static inline FIND_DATA FindFirst(const wxString& spec,
                                       FIND_STRUCT *finddata)
 {
-        return ::FindFirstFile(spec, finddata);
+        return ::FindFirstFile(spec.fn_str(), finddata);
 }
 
 static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
@@ -303,9 +303,20 @@ wxDir::wxDir(const wxString& dirname)
 bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;
-    m_data = new wxDirData(dirname);
+    
+    // The Unix code does a similar test
+    if (wxDirExists(dirname))
+    {
+        m_data = new wxDirData(dirname);
 
-    return true;
+        return true;
+    }
+    else
+    {
+        m_data = NULL;
+    
+        return false;
+    }
 }
 
 bool wxDir::IsOpened() const