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

fixed inconsistencies with indices in wxTE_RICH2 controls (remove CRs when streaming text out now)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-04 00:21:54 +00:00
parent 626117f778
commit 52a9e32988
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/msw/textctrl.cpp
View File

@@ -564,9 +564,8 @@ wxString wxTextCtrl::GetRange(long from, long to) const
if ( !str.empty() ) if ( !str.empty() )
{ {
// we have to manually extract the required part, luckily // we have to manually extract the required part, luckily
// this is easy in this case as EOL characters in richedit // this is easy in this case as EOL characters in str are
// version > 1 are just '\r's and so positions map to // just LFs because we remove CRs in wxRichEditStreamOut
// string indices one to one (unlike with richedit 1)
str = str.Mid(from, to - from); str = str.Mid(from, to - from);
} }
} }
@@ -681,24 +680,37 @@ wxRichEditStreamIn(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb)
return 0; return 0;
} }
// helper struct used to pass parameters from wxTextCtrl to wxRichEditStreamOut
struct wxStreamOutData
{
wchar_t *wpc;
size_t len;
};
DWORD CALLBACK DWORD CALLBACK
wxRichEditStreamOut(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb) wxRichEditStreamOut(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb)
{ {
*pcb = 0; *pcb = 0;
wchar_t ** const ppws = (wchar_t **)dwCookie; wxStreamOutData *data = (wxStreamOutData *)dwCookie;
const wchar_t *wbuf = (const wchar_t *)buf; const wchar_t *wbuf = (const wchar_t *)buf;
wchar_t *wpc = *ppws; wchar_t *wpc = data->wpc;
while ( cb && *wpc ) while ( cb )
{ {
*wpc++ = *wbuf++; wchar_t wch = *wbuf++;
// turn "\r\n" into "\n" on the fly
if ( wch != L'\r' )
*wpc++ = wch;
else
data->len--;
cb -= sizeof(wchar_t); cb -= sizeof(wchar_t);
(*pcb) += sizeof(wchar_t); (*pcb) += sizeof(wchar_t);
} }
*ppws = wpc; data->wpc = wpc;
return 0; return 0;
} }
@@ -783,9 +795,13 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const
wchar_t *wpc = wchBuf; wchar_t *wpc = wchBuf;
#endif #endif
wxStreamOutData data;
data.wpc = wpc;
data.len = len;
EDITSTREAM eds; EDITSTREAM eds;
wxZeroMemory(eds); wxZeroMemory(eds);
eds.dwCookie = (DWORD)&wpc; eds.dwCookie = (DWORD)&data;
eds.pfnCallback = wxRichEditStreamOut; eds.pfnCallback = wxRichEditStreamOut;
::SendMessage ::SendMessage
@@ -802,6 +818,10 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const
} }
else // streamed out ok else // streamed out ok
{ {
// NUL-terminate the string because its length could have been
// decreased by wxRichEditStreamOut
*(wchBuf.data() + data.len) = L'\0';
// now convert to the given encoding (this is a lossful conversion but // now convert to the given encoding (this is a lossful conversion but
// what else can we do) // what else can we do)
wxCSConv conv(encoding); wxCSConv conv(encoding);