X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a9c090515daf5abf994ef973eb4ee7de8816786..e319bb30f7e88242f56144fcc279b57047566a6b:/src/common/ffile.cpp?ds=sidebyside diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp index 2fa5abeff7..997bf03d2b 100644 --- a/src/common/ffile.cpp +++ b/src/common/ffile.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "ffile.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -35,6 +31,10 @@ #include "wx/log.h" #endif +#ifdef __WINDOWS__ +#include "wx/msw/mslu.h" +#endif + #include "wx/ffile.h" // ============================================================================ @@ -103,12 +103,12 @@ bool wxFFile::Close() // read/write // ---------------------------------------------------------------------------- -bool wxFFile::ReadAll(wxString *str, wxMBConv& conv) +bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv) { wxCHECK_MSG( str, false, wxT("invalid parameter") ); wxCHECK_MSG( IsOpened(), false, wxT("can't read from closed file") ); wxCHECK_MSG( Length() >= 0, false, wxT("invalid length") ); - size_t length = (size_t)Length(); + size_t length = wx_truncate_cast(size_t, Length()); wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") ); clearerr(m_fp);