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

Shift+Return now puts the cursor on the next line

Browse Source 
Fixed GetContiguousPlainText bug that caused wrapping problem


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2008-07-13 12:13:38 +00:00
parent e6f688797c
commit 043c0d5843
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/richtext/richtextbuffer.cpp
View File

@@ -4171,7 +4171,9 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex
text += textObj->GetTextForRange(range); text += textObj->GetTextForRange(range);
} }
else else
return true; {
text += wxT(" ");
}
} }
node = node->GetNext(); node = node->GetNext();
@@ -4191,7 +4193,9 @@ bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTex
text = textObj->GetTextForRange(range) + text; text = textObj->GetTextForRange(range) + text;
} }
else else
return true; {
text = wxT(" ") + text;
}
} }
node = node->GetPrevious(); node = node->GetPrevious();

2
src/richtext/richtextctrl.cpp
View File

@@ -697,6 +697,8 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
wxString text; wxString text;
text = wxRichTextLineBreakChar; text = wxRichTextLineBreakChar;
GetBuffer().InsertTextWithUndo(newPos+1, text, this); GetBuffer().InsertTextWithUndo(newPos+1, text, this);
m_caretAtLineStart = true;
PositionCaret();
} }
else else
GetBuffer().InsertNewlineWithUndo(newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE|wxRICHTEXT_INSERT_INTERACTIVE); GetBuffer().InsertNewlineWithUndo(newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE|wxRICHTEXT_INSERT_INTERACTIVE);