add support for alpha in color dialog on OSX, see #14127

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

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index 5404038be8c9d68a9335f934e9c4b97f5f9ccab3..2eea8fe7ffc04f4444aa45f630d2d8f98ef89f0e 100644 (file)
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/dir.cpp
+// Name:        src/msw/dir.cpp
 // Purpose:     wxDir implementation for Win32
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -30,7 +30,6 @@
 #endif // PCH
 
 #include "wx/dir.h"
-#include "wx/filefn.h"          // for wxDirExists()
 
 #ifdef __WINDOWS__
     #include "wx/msw/private.h"
@@ -68,7 +67,7 @@ inline void FreeFindData(FIND_DATA fd)
 inline FIND_DATA FindFirst(const wxString& spec,
                            FIND_STRUCT *finddata)
 {
-    return ::FindFirstFile(spec.fn_str(), finddata);
+    return ::FindFirstFile(spec.t_str(), finddata);
 }
 
 inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
@@ -209,7 +208,7 @@ bool wxDirData::Read(wxString *filename)
 
         if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )
         {
-            wxLogSysError(err, _("Can not enumerate files in directory '%s'"),
+            wxLogSysError(err, _("Cannot enumerate files in directory '%s'"),
                           m_dirname.c_str());
         }
 #endif // __WIN32__
@@ -287,16 +286,6 @@ bool wxDirData::Read(wxString *filename)
     return true;
 }
 
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxDirExists(dir);
-}
-
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------
@@ -311,7 +300,7 @@ wxDir::wxDir(const wxString& dirname)
 bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;
-    
+
     // The Unix code does a similar test
     if (wxDirExists(dirname))
     {
@@ -322,7 +311,7 @@ bool wxDir::Open(const wxString& dirname)
     else
     {
         m_data = NULL;
-    
+
         return false;
     }
 }
@@ -354,9 +343,13 @@ wxString wxDir::GetName() const
     return name;
 }
 
-wxDir::~wxDir()
+void wxDir::Close()
 {
-    delete M_DIR;
+    if ( m_data )
+    {
+        delete m_data;
+        m_data = NULL;
+    }
 }
 
 // ----------------------------------------------------------------------------