X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da865fdd325f7833246eecd665849b14f43e19d7..98a66b612f191649ec50c7595b8ffad7b588a075:/src/unix/dir.cpp diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp index 6907ca9b4a..16f0b36503 100644 --- a/src/unix/dir.cpp +++ b/src/unix/dir.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dir.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -136,7 +132,7 @@ bool wxDirData::Read(wxString *filename) return false; #if wxUSE_UNICODE - de_d_name = wxConvFileName->cMB2WC( de->d_name ); + de_d_name = wxString(de->d_name, *wxConvFileName); #else de_d_name = de->d_name; #endif @@ -294,7 +290,7 @@ bool wxDir::GetNext(wxString *filename) const return M_DIR->Read(filename); } -bool wxDir::HasSubDirs(const wxString& spec) +bool wxDir::HasSubDirs(const wxString& spec) const { wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );