X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4de1b652eaaf96dc29f5d066f59d694fe86d1d89..f0dfc29c713f1341a33b272aa395db9c36405a83:/src/msw/dir.cpp

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index 42b0128b41..ae9d7ddb9b 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)
@@ -184,7 +184,10 @@ bool wxDirData::Read(wxString *filename)
         {
             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);
 
@@ -198,7 +201,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, wxString(_("Can not enumerate files in directory '%s'")),
                           m_dirname.c_str());
         }
 #endif // __WIN32__