handle correctly never/always shown scrollbars in GetClientSize()

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

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index ae9d7ddb9b573b2fc7989c9ec16b6b02c343da0c..1bdeb321f7ba2942e53b855339bc96821acc2af1 100644 (file)
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -201,7 +201,7 @@ bool wxDirData::Read(wxString *filename)
 
         if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )
         {
 
         if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )
         {

-            wxLogSysError(err, wxString(_("Can not enumerate files in directory '%s'")),
+            wxLogSysError(err, _("Can not enumerate files in directory '%s'"),

                           m_dirname.c_str());
         }
 #endif // __WIN32__
                           m_dirname.c_str());
         }
 #endif // __WIN32__


@@ -303,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