Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fixes for wxUSE_STL == 1 and for wxUSE_UNICODE == 1.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-11-23 08:16:36 +00:00
parent 1a6d9c7680
commit 8e5ec9cc58
4 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/src/stc/stc.cpp
View File

@@ -2144,20 +2144,16 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
if (file.IsOpened()) if (file.IsOpened())
{ {
wxString contents; wxString contents;
#if wxUSE_UNICODE
wxMemoryBuffer buffer;
#else
wxString buffer;
#endif
off_t len = file.Length(); off_t len = file.Length();
if (len > 0) if (len > 0)
{ {
void *bufptr = buffer.GetWriteBuf(len);
success = (file.Read(bufptr, len) == len);
buffer.UngetWriteBuf(len);
#if wxUSE_UNICODE #if wxUSE_UNICODE
wxMemoryBuffer buffer(len);
success = (file.Read(buffer.GetData(), len) == len);
contents = wxString(buffer, *wxConvCurrent); contents = wxString(buffer, *wxConvCurrent);
#else #else
wxString buffer;
success = (file.Read(wxStringBuffer(buffer, len), len) == len);
contents = buffer; contents = buffer;
#endif #endif
} }

12
contrib/src/stc/stc.cpp.in
View File

@@ -349,20 +349,16 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
if (file.IsOpened()) if (file.IsOpened())
{ {
wxString contents; wxString contents;
#if wxUSE_UNICODE
wxMemoryBuffer buffer;
#else
wxString buffer;
#endif
off_t len = file.Length(); off_t len = file.Length();
if (len > 0) if (len > 0)
{ {
void *bufptr = buffer.GetWriteBuf(len);
success = (file.Read(bufptr, len) == len);
buffer.UngetWriteBuf(len);
#if wxUSE_UNICODE #if wxUSE_UNICODE
wxMemoryBuffer buffer(len);
success = (file.Read(buffer.GetData(), len) == len);
contents = wxString(buffer, *wxConvCurrent); contents = wxString(buffer, *wxConvCurrent);
#else #else
wxString buffer;
success = (file.Read(wxStringBuffer(buffer, len), len) == len);
contents = buffer; contents = buffer;
#endif #endif
} }

12
src/stc/stc.cpp
View File

@@ -2144,20 +2144,16 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
if (file.IsOpened()) if (file.IsOpened())
{ {
wxString contents; wxString contents;
#if wxUSE_UNICODE
wxMemoryBuffer buffer;
#else
wxString buffer;
#endif
off_t len = file.Length(); off_t len = file.Length();
if (len > 0) if (len > 0)
{ {
void *bufptr = buffer.GetWriteBuf(len);
success = (file.Read(bufptr, len) == len);
buffer.UngetWriteBuf(len);
#if wxUSE_UNICODE #if wxUSE_UNICODE
wxMemoryBuffer buffer(len);
success = (file.Read(buffer.GetData(), len) == len);
contents = wxString(buffer, *wxConvCurrent); contents = wxString(buffer, *wxConvCurrent);
#else #else
wxString buffer;
success = (file.Read(wxStringBuffer(buffer, len), len) == len);
contents = buffer; contents = buffer;
#endif #endif
} }

12
src/stc/stc.cpp.in
View File

@@ -349,20 +349,16 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
if (file.IsOpened()) if (file.IsOpened())
{ {
wxString contents; wxString contents;
#if wxUSE_UNICODE
wxMemoryBuffer buffer;
#else
wxString buffer;
#endif
off_t len = file.Length(); off_t len = file.Length();
if (len > 0) if (len > 0)
{ {
void *bufptr = buffer.GetWriteBuf(len);
success = (file.Read(bufptr, len) == len);
buffer.UngetWriteBuf(len);
#if wxUSE_UNICODE #if wxUSE_UNICODE
wxMemoryBuffer buffer(len);
success = (file.Read(buffer.GetData(), len) == len);
contents = wxString(buffer, *wxConvCurrent); contents = wxString(buffer, *wxConvCurrent);
#else #else
wxString buffer;
success = (file.Read(wxStringBuffer(buffer, len), len) == len);
contents = buffer; contents = buffer;
#endif #endif
} }