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

Fixed a control-arrow bug

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-02-23 10:30:40 +00:00
parent 1c44e75697
commit 83d4d9efdf
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/richtext/richtextctrl.cpp
View File

@@ -438,7 +438,7 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event)
// See if we need to change the cursor
{
if (hit != wxRICHTEXT_HITTEST_NONE & !(hit & wxRICHTEXT_HITTEST_OUTSIDE))
if (hit != wxRICHTEXT_HITTEST_NONE && !(hit & wxRICHTEXT_HITTEST_OUTSIDE))
{
wxTextAttrEx attr;
if (GetStyle(position, attr))
@@ -1556,6 +1556,11 @@ bool wxRichTextCtrl::PageDown(int noPages, int flags)
return false;
}
static bool wxRichTextCtrlIsWhitespace(const wxString& str)
{
return str == wxT(" ") || str == wxT("\t");
}
// Finds the caret position for the next word
long wxRichTextCtrl::FindNextWordPosition(int direction) const
{
@@ -1570,7 +1575,12 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
{
// i is in character, not caret positions
wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
if (text != wxT(" ") && !text.empty())
wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
if (line && (i == line->GetAbsoluteRange().GetEnd()))
{
break;
}
else if (!wxRichTextCtrlIsWhitespace(text) && !text.empty())
i += direction;
else
{
@@ -1581,9 +1591,13 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
{
// i is in character, not caret positions
wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
if (line && (i == line->GetAbsoluteRange().GetEnd()))
return wxMax(-1, i);
if (text.empty()) // End of paragraph, or maybe an image
return wxMax(-1, i - 1);
else if (text == wxT(" ") || text.empty())
else if (wxRichTextCtrlIsWhitespace(text) || text.empty())
i += direction;
else
{
@@ -1604,9 +1618,11 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
{
// i is in character, not caret positions
wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
if (text.empty()) // End of paragraph, or maybe an image
wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
if (text.empty() || (line && (i == line->GetAbsoluteRange().GetStart()))) // End of paragraph, or maybe an image
break;
else if (text == wxT(" ") || text.empty())
else if (wxRichTextCtrlIsWhitespace(text) || text.empty())
i += direction;
else
break;
@@ -1616,7 +1632,11 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
{
// i is in character, not caret positions
wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
if (text != wxT(" ") /* && !text.empty() */)
wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
if (line && line->GetAbsoluteRange().GetStart() == i)
return i-1;
if (!wxRichTextCtrlIsWhitespace(text) /* && !text.empty() */)
i += direction;
else
{