fix bug with wxCSConv("ASCII")

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

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index 42b0128b412bccbd2e2ec2c337ed8da64e01853e..1bdeb321f7ba2942e53b855339bc96821acc2af1 100644 (file)
--- 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)
 {
 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)
 }
 
 static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)


@@ -184,7 +184,10 @@ bool wxDirData::Read(wxString *filename)
         {
             filespec += _T('\\');
         }
         {
             filespec += _T('\\');
         }

-        filespec += (!m_filespec ? _T("*.*") : m_filespec.c_str());
+        if ( !m_filespec )
+            filespec += _T("*.*");
+        else
+            filespec += m_filespec;

 
         m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
 
 
         m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
 


@@ -300,9 +303,20 @@ wxDir::wxDir(const wxString& dirname)
 bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;
 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
 }
 
 bool wxDir::IsOpened() const