X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39c0acb66674c5e0424633cf162e6c10c92178d4..5955710c8bd346e8be675bd1dbbd427723a57920:/src/stc/stc.cpp.in diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in index 4cc177306f..9b9825a9db 100644 --- a/src/stc/stc.cpp.in +++ b/src/stc/stc.cpp.in @@ -349,20 +349,16 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename) if (file.IsOpened()) { wxString contents; -#if wxUSE_UNICODE - wxMemoryBuffer buffer; -#else - wxString buffer; -#endif off_t len = file.Length(); if (len > 0) { - void *bufptr = buffer.GetWriteBuf(len); - success = (file.Read(bufptr, len) == len); - buffer.UngetWriteBuf(len); #if wxUSE_UNICODE + wxMemoryBuffer buffer(len); + success = (file.Read(buffer.GetData(), len) == len); contents = wxString(buffer, *wxConvCurrent); #else + wxString buffer; + success = (file.Read(wxStringBuffer(buffer, len), len) == len); contents = buffer; #endif }