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

Don't insert a newline when we get text

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-06-07 12:49:35 +00:00
parent 3a9b6f8275
commit 85543d154a
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/richtext/richtextbuffer.cpp
View File

@@ -1429,8 +1429,6 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra
wxRichTextObject* child = node->GetData(); wxRichTextObject* child = node->GetData();
if (!child->GetRange().IsOutside(range)) if (!child->GetRange().IsOutside(range))
{ {
// if (lineCount > 0)
// text += wxT("\n");
wxRichTextRange childRange = range; wxRichTextRange childRange = range;
childRange.LimitTo(child->GetRange()); childRange.LimitTo(child->GetRange());
@@ -1438,7 +1436,7 @@ wxString wxRichTextParagraphLayoutBox::GetTextForRange(const wxRichTextRange& ra
text += childText; text += childText;
if (childRange.GetEnd() == child->GetRange().GetEnd()) if ((childRange.GetEnd() == child->GetRange().GetEnd()) && node->GetNext())
text += wxT("\n"); text += wxT("\n");
lineCount ++; lineCount ++;

21
src/richtext/richtextctrl.cpp
View File

@@ -2035,30 +2035,21 @@ void wxRichTextCtrl::DoSetValue(const wxString& value, int flags)
{ {
Clear(); Clear();
// if the text is long enough, it's faster to just set it instead of first if (!value.IsEmpty())
// comparing it with the old one (chances are that it will be different
// anyhow, this comparison is there to avoid flicker for small single-line
// edit controls mostly)
if ( (value.length() > 0x400) || (value != GetValue()) )
{ {
// Remove empty paragraph
GetBuffer().Clear();
DoWriteText(value); DoWriteText(value);
// for compatibility, don't move the cursor when doing SetValue() // for compatibility, don't move the cursor when doing SetValue()
SetInsertionPoint(0); SetInsertionPoint(0);
} }
else // same text else
{ {
if ( flags & SetValue_SendEvent ) // still send an event for consistency
{ if (flags & SetValue_SendEvent)
// still send an event for consistency
SendTextUpdatedEvent(); SendTextUpdatedEvent();
}
} }
// we should reset the modified flag even if the value didn't really change
// mark the control as being not dirty - we changed its text, not the
// user
DiscardEdits(); DiscardEdits();
} }