detection of aqua layout scheme added

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

diff --git a/src/mgl/dir.cpp b/src/mgl/dir.cpp
index 2fdbfe2d3d800c42d250074568f786f2991df200..b325114f1cc6eb1907aed7e41a802db8c7b141d9 100644 (file)
--- a/src/mgl/dir.cpp
+++ b/src/mgl/dir.cpp
@@ -116,10 +116,11 @@ bool wxDirData::Read(wxString *filename)
     PM_findData data;
     bool matches = FALSE;
 
-    // speed up string concatenation in the loop a bit
+    data.dwSize = sizeof(data);
+    
     wxString path = m_dirname;
     path += wxFILE_SEP_PATH;
-    path.reserve(path.length() + 255);
+    path.reserve(path.length() + 255); // speed up string concatenation
 
     while ( !matches )
     {
@@ -195,19 +196,15 @@ wxDir::wxDir(const wxString& dirname)
 bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;
-    m_data = new wxDirData(dirname);
-
-    if ( !M_DIR->IsOk() )
+    m_data = NULL;
+    
+    if ( !wxDir::Exists(dirname) )
     {
-        wxLogSysError(_("Can not enumerate files in directory '%s'"),
-                      dirname.c_str());
-
-        delete M_DIR;
-        m_data = NULL;
-
+        wxLogError(_("Directory '%s' doesn't exist!"), dirname.c_str());
         return FALSE;
     }
-
+    
+    m_data = new wxDirData(dirname);
     return TRUE;
 }