wxFLAGS_MEMBER(wxDOUBLE_BORDER)
wxFLAGS_MEMBER(wxRAISED_BORDER)
wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxNO_BORDER)
+ wxFLAGS_MEMBER(wxBORDER)
// standard window styles
wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
wxFLAGS_MEMBER(wxCLIP_CHILDREN)
wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+ wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
wxFLAGS_MEMBER(wxVSCROLL)
wxFLAGS_MEMBER(wxHSCROLL)
if ( to == -1 )
to = len;
+#if !wxUSE_UNICODE
// we must use EM_STREAMOUT if we don't want to lose all characters
// not representable in the current character set (EM_GETTEXTRANGE
// simply replaces them with question marks...)
- //
- // as EM_STREAMOUT only works for the entire controls contents (or
- // just the selection but it's probably a bad idea to play games
- // with selection here...), we can't use it unless we're called
- // from GetValue(), i.e. we want to retrieve all text
- if ( GetRichVersion() > 1 && (from == 0 && to >= len) )
+ if ( GetRichVersion() > 1 )
{
+ // we must have some encoding, otherwise any 8bit chars in the
+ // control are simply *lost* (replaced by '?')
+ wxFontEncoding encoding = wxFONTENCODING_SYSTEM;
+
wxFont font = m_defaultStyle.GetFont();
if ( !font.Ok() )
font = GetFont();
if ( font.Ok() )
{
- wxFontEncoding encoding = font.GetEncoding();
- if ( encoding != wxFONTENCODING_SYSTEM )
- {
- str = StreamOut(encoding);
- }
+ encoding = font.GetEncoding();
+ }
+
+ if ( encoding == wxFONTENCODING_SYSTEM )
+ {
+ encoding = wxLocale::GetSystemEncoding();
+ }
+
+ if ( encoding == wxFONTENCODING_SYSTEM )
+ {
+ encoding = wxFONTENCODING_ISO8859_1;
+ }
+
+ str = StreamOut(encoding);
+
+ if ( !str.empty() )
+ {
+ // we have to manually extract the required part, luckily
+ // this is easy in this case as EOL characters in str are
+ // just LFs because we remove CRs in wxRichEditStreamOut
+ str = str.Mid(from, to - from);
}
}
// StreamOut() wasn't used or failed, try to do it in normal way
if ( str.empty() )
+#endif // !wxUSE_UNICODE
{
// alloc one extra WORD as needed by the control
wxStringBuffer tmp(str, ++len);
TEXTRANGE textRange;
textRange.chrg.cpMin = from;
- textRange.chrg.cpMax = to == -1 ? len : to;
+ textRange.chrg.cpMax = to;
textRange.lpstrText = p;
(void)SendMessage(GetHwnd(), EM_GETTEXTRANGE,
if ( (value.length() > 0x400) || (value != GetValue()) )
{
DoWriteText(value, FALSE /* not selection only */);
+
+ // for compatibility, don't move the cursor when doing SetValue()
+ SetInsertionPoint(0);
}
else // same text
{
// mark the control as being not dirty - we changed its text, not the
// user
DiscardEdits();
-
- // for compatibility, don't move the cursor when doing SetValue()
- SetInsertionPoint(0);
}
#if wxUSE_RICHEDIT && (!wxUSE_UNICODE || wxUSE_UNICODE_MSLU)
return 0;
}
+// helper struct used to pass parameters from wxTextCtrl to wxRichEditStreamOut
+struct wxStreamOutData
+{
+ wchar_t *wpc;
+ size_t len;
+};
+
DWORD CALLBACK
wxRichEditStreamOut(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb)
{
*pcb = 0;
- wchar_t ** const ppws = (wchar_t **)dwCookie;
+ wxStreamOutData *data = (wxStreamOutData *)dwCookie;
const wchar_t *wbuf = (const wchar_t *)buf;
- wchar_t *wpc = *ppws;
- while ( cb && *wpc )
+ wchar_t *wpc = data->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);
(*pcb) += sizeof(wchar_t);
}
- *ppws = wpc;
+ data->wpc = wpc;
return 0;
}
wchar_t *wpc = wchBuf;
#endif
+ wxStreamOutData data;
+ data.wpc = wpc;
+ data.len = len;
+
EDITSTREAM eds;
wxZeroMemory(eds);
- eds.dwCookie = (DWORD)&wpc;
+ eds.dwCookie = (DWORD)&data;
eds.pfnCallback = wxRichEditStreamOut;
::SendMessage
}
else // streamed out ok
{
- // now convert to the given encoding (this is a lossful conversion but
- // what else can we do)
+ // 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 possibly lossful
+ // conversion but what else can we do)
wxCSConv conv(encoding);
- size_t lenNeeded = conv.WC2MB(NULL, wchBuf, len);
- if ( lenNeeded )
+ size_t lenNeeded = conv.WC2MB(NULL, wchBuf, 0);
+ if ( lenNeeded++ )
{
- conv.WC2MB(wxStringBuffer(out, lenNeeded), wchBuf, len);
+ conv.WC2MB(wxStringBuffer(out, lenNeeded), wchBuf, lenNeeded);
}
}
// Set selection and remove it
DoSetSelection(from, to, FALSE /* don't scroll caret into view */);
- SendMessage(GetHwnd(), EM_REPLACESEL,
-#ifdef __WIN32__
- TRUE,
-#else
- FALSE,
-#endif
- (LPARAM)value.c_str());
+ DoWriteText(value, TRUE /* selection only */);
}
void wxTextCtrl::Remove(long from, long to)
return SendMessage(GetHwnd(), EM_GETMODIFY, 0, 0) != 0;
}
-// Makes 'unmodified'
+void wxTextCtrl::MarkDirty()
+{
+ SendMessage(GetHwnd(), EM_SETMODIFY, TRUE, 0L);
+}
+
void wxTextCtrl::DiscardEdits()
{
SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);
projects / wxWidgets.git / blobdiff