AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small cleanup.

Browse Source 
Set caret position when calling SetSelection.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2006-11-18 22:27:48 +00:00
parent 9745cf4d6c
commit 12cc29c56a
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/richtext/richtextbuffer.h
View File

@ -1844,7 +1844,7 @@ public:
bool InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags = 0); bool InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags = 0);
/// Submit command to delete this range /// Submit command to delete this range
bool DeleteRangeWithUndo(const wxRichTextRange& range, long initialCaretPosition, long newCaretPositon, wxRichTextCtrl* ctrl); bool DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl);
/// Mark modified /// Mark modified
void Modify(bool modify = true) { m_modified = modify; } void Modify(bool modify = true) { m_modified = modify; }

3
include/wx/richtext/richtextctrl.h
View File

@ -224,6 +224,9 @@ public:
virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1); virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1);
virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1); virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1);
/// Deletes the content in the given range
virtual bool Delete(const wxRichTextRange& range);
// translate between the position (which is just an index in the text ctrl // translate between the position (which is just an index in the text ctrl
// considering all its contents as a single strings) and (x, y) coordinates // considering all its contents as a single strings) and (x, y) coordinates
// which represent column and line. // which represent column and line.

4
src/richtext/richtextbuffer.cpp
View File

@ -4810,11 +4810,11 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos
} }
/// Submit command to delete this range /// Submit command to delete this range
bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, long initialCaretPosition, long WXUNUSED(newCaretPositon), wxRichTextCtrl* ctrl) bool wxRichTextBuffer::DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl)
{ {
wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, this, ctrl); wxRichTextAction* action = new wxRichTextAction(NULL, _("Delete"), wxRICHTEXT_DELETE, this, ctrl);
action->SetPosition(initialCaretPosition); action->SetPosition(ctrl->GetCaretPosition());
// Set the range to delete // Set the range to delete
action->SetRange(range); action->SetRange(range);

7
src/richtext/richtextctrl.cpp
View File

@ -2249,6 +2249,7 @@ void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCare
{ {
m_selectionAnchor = from; m_selectionAnchor = from;
m_selectionRange.SetRange(from, to-1); m_selectionRange.SetRange(from, to-1);
m_caretPosition = from-1;
Refresh(false); Refresh(false);
PositionCaret(); PositionCaret();
@ -3098,6 +3099,12 @@ bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, co
return GetBuffer().PromoteList(promoteBy, range.ToInternal(), defName, flags, specifiedLevel); return GetBuffer().PromoteList(promoteBy, range.ToInternal(), defName, flags, specifiedLevel);
} }
/// Deletes the content in the given range
bool wxRichTextCtrl::Delete(const wxRichTextRange& range)
{
return GetBuffer().DeleteRangeWithUndo(range.ToInternal(), this);
}
const wxArrayString& wxRichTextCtrl::GetAvailableFontNames() const wxArrayString& wxRichTextCtrl::GetAvailableFontNames()
{ {
if (sm_availableFontNames.GetCount() == 0) if (sm_availableFontNames.GetCount() == 0)