/////////////////////////////////////////////////////////////////////////////
-// Name: src/richtext/richeditctrl.cpp
+// Name: src/richtext/richtextctrl.cpp
// Purpose: A rich edit control
// Author: Julian Smart
// Modified by:
#include "wx/settings.h"
#endif
+#include "wx/timer.h"
#include "wx/textfile.h"
#include "wx/ffile.h"
#include "wx/filename.h"
#include "wx/app.h"
WX_CHECK_BUILD_OPTIONS("wxRichTextCtrl")
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_LEFT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_RETURN)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_CHARACTER)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_DELETE)
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED)
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET)
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RETURN, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CHARACTER, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_DELETE, wxRichTextEvent );
+
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED, wxRichTextEvent );
+
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED, wxRichTextEvent );
#if wxRICHTEXT_USE_OWN_CARET
* wxRICHTEXT_USE_OWN_CARET is set in richtextbuffer.h.
*/
+class wxRichTextCaret;
+class wxRichTextCaretTimer: public wxTimer
+{
+ public:
+ wxRichTextCaretTimer(wxRichTextCaret* caret)
+ {
+ m_caret = caret;
+ }
+ virtual void Notify();
+ wxRichTextCaret* m_caret;
+};
+
class wxRichTextCaret: public wxCaret
{
public:
// ctors
// -----
// default - use Create()
- wxRichTextCaret() { Init(); }
+ wxRichTextCaret(): m_timer(this) { Init(); }
// creates a block caret associated with the given window
wxRichTextCaret(wxRichTextCtrl *window, int width, int height)
- : wxCaret(window, width, height) { Init(); m_richTextCtrl = window; }
+ : wxCaret(window, width, height), m_timer(this) { Init(); m_richTextCtrl = window; }
wxRichTextCaret(wxRichTextCtrl *window, const wxSize& size)
- : wxCaret(window, size) { Init(); m_richTextCtrl = window; }
+ : wxCaret(window, size), m_timer(this) { Init(); m_richTextCtrl = window; }
virtual ~wxRichTextCaret();
bool GetNeedsUpdate() const { return m_needsUpdate; }
void SetNeedsUpdate(bool needsUpdate = true ) { m_needsUpdate = needsUpdate; }
+ void Notify();
+
protected:
virtual void DoShow();
virtual void DoHide();
m_yOld;
bool m_hasFocus; // true => our window has focus
bool m_needsUpdate; // must be repositioned
-
+ bool m_flashOn;
+ wxRichTextCaretTimer m_timer;
wxRichTextCtrl* m_richTextCtrl;
};
#endif
EVT_MENU(wxID_SELECTALL, wxRichTextCtrl::OnSelectAll)
EVT_UPDATE_UI(wxID_SELECTALL, wxRichTextCtrl::OnUpdateSelectAll)
+
+ EVT_MENU(wxID_RICHTEXT_PROPERTIES1, wxRichTextCtrl::OnProperties)
+ EVT_UPDATE_UI(wxID_RICHTEXT_PROPERTIES1, wxRichTextCtrl::OnUpdateProperties)
+
+ EVT_MENU(wxID_RICHTEXT_PROPERTIES2, wxRichTextCtrl::OnProperties)
+ EVT_UPDATE_UI(wxID_RICHTEXT_PROPERTIES2, wxRichTextCtrl::OnUpdateProperties)
+
+ EVT_MENU(wxID_RICHTEXT_PROPERTIES3, wxRichTextCtrl::OnProperties)
+ EVT_UPDATE_UI(wxID_RICHTEXT_PROPERTIES3, wxRichTextCtrl::OnUpdateProperties)
+
END_EVENT_TABLE()
/*!
bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style,
const wxValidator& validator, const wxString& name)
{
+ style |= wxVSCROLL;
+
if (!wxControl::Create(parent, id, pos, size,
style|wxFULL_REPAINT_ON_RESIZE,
validator, name))
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
}
+ // No physical scrolling, so we can preserve margins
+ EnableScrolling(false, false);
+
if (style & wxTE_READONLY)
SetEditable(false);
// The base attributes must all have default values
- wxTextAttr attributes;
+ wxRichTextAttr attributes;
attributes.SetFont(GetFont());
attributes.SetTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
attributes.SetAlignment(wxTEXT_ALIGNMENT_LEFT);
SetBasicStyle(attributes);
+ int margin = 5;
+ SetMargins(margin, margin);
+
// The default attributes will be merged with base attributes, so
// can be empty to begin with
- wxTextAttr defaultAttributes;
+ wxRichTextAttr defaultAttributes;
SetDefaultStyle(defaultAttributes);
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
wxAcceleratorTable accel(6, entries);
SetAcceleratorTable(accel);
+ m_contextMenu = new wxMenu;
+ m_contextMenu->Append(wxID_UNDO, _("&Undo"));
+ m_contextMenu->Append(wxID_REDO, _("&Redo"));
+ m_contextMenu->AppendSeparator();
+ m_contextMenu->Append(wxID_CUT, _("Cu&t"));
+ m_contextMenu->Append(wxID_COPY, _("&Copy"));
+ m_contextMenu->Append(wxID_PASTE, _("&Paste"));
+ m_contextMenu->Append(wxID_CLEAR, _("&Delete"));
+ m_contextMenu->AppendSeparator();
+ m_contextMenu->Append(wxID_SELECTALL, _("Select &All"));
+ m_contextMenu->AppendSeparator();
+ m_contextMenu->Append(wxID_RICHTEXT_PROPERTIES1, _("&Properties"));
+
return true;
}
wxRichTextCtrl::~wxRichTextCtrl()
{
+ SetFocusObject(& GetBuffer(), false);
GetBuffer().RemoveEventHandler(this);
delete m_contextMenu;
m_contextMenu = NULL;
m_caret = NULL;
m_caretPosition = -1;
- m_selectionRange.SetRange(-2, -2);
m_selectionAnchor = -2;
+ m_selectionAnchorObject = NULL;
+ m_selectionState = wxRichTextCtrlSelectionState_Normal;
m_editable = true;
m_caretAtLineStart = false;
m_dragging = false;
m_fullLayoutSavedPosition = 0;
m_delayedLayoutThreshold = wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD;
m_caretPositionForDefaultStyle = -2;
+ m_focusObject = & m_buffer;
}
void wxRichTextCtrl::DoThaw()
{
- if (GetBuffer().GetDirty())
+ if (GetBuffer().IsDirty())
LayoutContent();
else
SetupScrollbars();
/// Clear all text
void wxRichTextCtrl::Clear()
{
- m_buffer.ResetAndClearCommands();
- m_buffer.SetDirty(true);
+ if (GetFocusObject() == & GetBuffer())
+ {
+ m_buffer.ResetAndClearCommands();
+ m_buffer.Invalidate(wxRICHTEXT_ALL);
+ }
+ else
+ {
+ GetFocusObject()->Reset();
+ }
+
m_caretPosition = -1;
m_caretPositionForDefaultStyle = -2;
m_caretAtLineStart = false;
- m_selectionRange.SetRange(-2, -2);
+ m_selection.Reset();
+ m_selectionState = wxRichTextCtrlSelectionState_Normal;
Scroll(0,0);
drawingArea.SetPosition(GetLogicalPoint(drawingArea.GetPosition()));
wxRect availableSpace(GetClientSize());
- if (GetBuffer().GetDirty())
+ if (GetBuffer().IsDirty())
{
GetBuffer().Layout(dc, availableSpace, wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_VARIABLE_HEIGHT);
- GetBuffer().SetDirty(false);
+ GetBuffer().Invalidate(wxRICHTEXT_NONE);
SetupScrollbars();
}
- GetBuffer().Draw(dc, GetBuffer().GetRange(), GetInternalSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
+ wxRect clipRect(availableSpace);
+ clipRect.x += GetBuffer().GetLeftMargin();
+ clipRect.y += GetBuffer().GetTopMargin();
+ clipRect.width -= (GetBuffer().GetLeftMargin() + GetBuffer().GetRightMargin());
+ clipRect.height -= (GetBuffer().GetTopMargin() + GetBuffer().GetBottomMargin());
+ clipRect.SetPosition(GetLogicalPoint(clipRect.GetPosition()));
+ dc.SetClippingRegion(clipRect);
+
+ int flags = 0;
+ if ((GetExtraStyle() & wxRICHTEXT_EX_NO_GUIDELINES) == 0)
+ flags |= wxRICHTEXT_DRAW_GUIDELINES;
+
+ GetBuffer().Draw(dc, GetBuffer().GetOwnRange(), GetSelection(), drawingArea, 0 /* descent */, flags);
+
+ dc.DestroyClippingRegion();
+
+ // Other user defined painting after everything else (i.e. all text) is painted
+ PaintAboveContent(dc);
+
#if wxRICHTEXT_USE_OWN_CARET
if (GetCaret()->IsVisible())
{
m_dragging = false;
}
+// Set up the caret for the given position and container, after a mouse click
+bool wxRichTextCtrl::SetCaretPositionAfterClick(wxRichTextParagraphLayoutBox* container, long position, int hitTestFlags, bool extendSelection)
+{
+ bool caretAtLineStart = false;
+
+ if (hitTestFlags & wxRICHTEXT_HITTEST_BEFORE)
+ {
+ // If we're at the start of a line (but not first in para)
+ // then we should keep the caret showing at the start of the line
+ // by showing the m_caretAtLineStart flag.
+ wxRichTextParagraph* para = container->GetParagraphAtPosition(position);
+ wxRichTextLine* line = container->GetLineAtPosition(position);
+
+ if (line && para && line->GetAbsoluteRange().GetStart() == position && para->GetRange().GetStart() != position)
+ caretAtLineStart = true;
+ position --;
+ }
+
+ if (extendSelection && (m_caretPosition != position))
+ ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN);
+
+ MoveCaret(position, caretAtLineStart);
+ SetDefaultStyleToCursorStyle();
+
+ return true;
+}
+
/// Left-click
void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event)
{
PrepareDC(dc);
dc.SetFont(GetFont());
+ // TODO: detect change of focus object
long position = 0;
- int hit = GetBuffer().HitTest(dc, event.GetLogicalPosition(dc), position);
+ wxRichTextObject* hitObj = NULL;
+ wxRichTextObject* contextObj = NULL;
+ int hit = GetBuffer().HitTest(dc, event.GetLogicalPosition(dc), position, & hitObj, & contextObj);
- if (hit != wxRICHTEXT_HITTEST_NONE)
+ if (hit != wxRICHTEXT_HITTEST_NONE && hitObj)
{
+ wxRichTextParagraphLayoutBox* oldFocusObject = GetFocusObject();
+ wxRichTextParagraphLayoutBox* container = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+ if (container && container != GetFocusObject() && container->AcceptsFocus())
+ {
+ SetFocusObject(container, false /* don't set caret position yet */);
+ }
+
m_dragStart = event.GetLogicalPosition(dc);
m_dragging = true;
CaptureMouse();
- bool caretAtLineStart = false;
-
- if (hit & wxRICHTEXT_HITTEST_BEFORE)
- {
- // If we're at the start of a line (but not first in para)
- // then we should keep the caret showing at the start of the line
- // by showing the m_caretAtLineStart flag.
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
- wxRichTextLine* line = GetBuffer().GetLineAtPosition(position);
-
- if (line && para && line->GetAbsoluteRange().GetStart() == position && para->GetRange().GetStart() != position)
- caretAtLineStart = true;
- position --;
- }
-
long oldCaretPos = m_caretPosition;
- MoveCaret(position, caretAtLineStart);
- SetDefaultStyleToCursorStyle();
+ SetCaretPositionAfterClick(container, position, hit);
- if (event.ShiftDown())
+ // For now, don't handle shift-click when we're selecting multiple objects.
+ if (event.ShiftDown() && GetFocusObject() == oldFocusObject && m_selectionState == wxRichTextCtrlSelectionState_Normal)
{
- if (m_selectionRange.GetStart() == -2)
+ if (!m_selection.IsValid())
ExtendSelection(oldCaretPos, m_caretPosition, wxRICHTEXT_SHIFT_DOWN);
else
ExtendSelection(m_caretPosition, m_caretPosition, wxRICHTEXT_SHIFT_DOWN);
long position = 0;
wxPoint logicalPt = event.GetLogicalPosition(dc);
- int hit = GetBuffer().HitTest(dc, logicalPt, position);
+ wxRichTextObject* hitObj = NULL;
+ wxRichTextObject* contextObj = NULL;
+ // Only get objects at this level, not nested, because otherwise we couldn't swipe text at a single level.
+ int hit = GetFocusObject()->HitTest(dc, logicalPt, position, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS);
if ((hit != wxRICHTEXT_HITTEST_NONE) && !(hit & wxRICHTEXT_HITTEST_OUTSIDE))
{
wxEVT_COMMAND_RICHTEXT_LEFT_CLICK,
GetId());
cmdEvent.SetEventObject(this);
- cmdEvent.SetPosition(m_caretPosition+1);
+ cmdEvent.SetPosition(position);
+ if (hitObj)
+ cmdEvent.SetContainer(hitObj->GetContainer());
if (!GetEventHandler()->ProcessEvent(cmdEvent))
{
- wxTextAttr attr;
+ wxRichTextAttr attr;
if (GetStyle(position, attr))
{
if (attr.HasFlag(wxTEXT_ATTR_URL))
wxMouseEvent mouseEvent(event);
long startPos = 0, endPos = 0;
- wxRichTextObject* obj = GetBuffer().GetLeafObjectAtPosition(position);
+ wxRichTextObject* obj = GetFocusObject()->GetLeafObjectAtPosition(position);
if (obj)
{
startPos = obj->GetRange().GetStart();
long position = 0;
wxPoint logicalPt = event.GetLogicalPosition(dc);
- int hit = GetBuffer().HitTest(dc, logicalPt, position);
+ wxRichTextObject* hitObj = NULL;
+ wxRichTextObject* contextObj = NULL;
+
+ int flags = 0;
+
+ // If we're dragging, let's only consider positions at this level; otherwise
+ // selecting a range is not going to work.
+ wxRichTextParagraphLayoutBox* container = & GetBuffer();
+ if (m_dragging)
+ {
+ flags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS;
+ container = GetFocusObject();
+ }
+ int hit = container->HitTest(dc, logicalPt, position, & hitObj, & contextObj, flags);
// 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) && hitObj)
{
- wxTextAttr attr;
- if (GetStyle(position, attr))
+ wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+ wxRichTextAttr attr;
+ if (actualContainer && GetStyle(position, attr, actualContainer))
{
if (attr.HasFlag(wxTEXT_ATTR_URL))
{
return;
}
- if (m_dragging && hit != wxRICHTEXT_HITTEST_NONE)
+ if (m_dragging)
{
- // TODO: test closeness
+ wxRichTextParagraphLayoutBox* commonAncestor = NULL;
+ wxRichTextParagraphLayoutBox* otherContainer = NULL;
+ wxRichTextParagraphLayoutBox* firstContainer = NULL;
+
+ // Check for dragging across multiple containers
+ long position2 = 0;
+ wxRichTextObject* hitObj2 = NULL, *contextObj2 = NULL;
+ int hit2 = GetBuffer().HitTest(dc, logicalPt, position2, & hitObj2, & contextObj2, 0);
+ if (hit2 != wxRICHTEXT_HITTEST_NONE && !(hit2 & wxRICHTEXT_HITTEST_OUTSIDE) && hitObj2 && hitObj != hitObj2)
+ {
+ // See if we can find a common ancestor
+ if (m_selectionState == wxRichTextCtrlSelectionState_Normal)
+ {
+ firstContainer = GetFocusObject();
+ commonAncestor = wxDynamicCast(firstContainer->GetParent(), wxRichTextParagraphLayoutBox);
+ }
+ else
+ {
+ firstContainer = wxDynamicCast(m_selectionAnchorObject, wxRichTextParagraphLayoutBox);
+ //commonAncestor = GetFocusObject(); // when the selection state is not normal, the focus object (e.g. table)
+ // is the common ancestor.
+ commonAncestor = wxDynamicCast(firstContainer->GetParent(), wxRichTextParagraphLayoutBox);
+ }
- bool caretAtLineStart = false;
+ if (commonAncestor && commonAncestor->HandlesChildSelections())
+ {
+ wxRichTextObject* p = hitObj2;
+ while (p)
+ {
+ if (p->GetParent() == commonAncestor)
+ {
+ otherContainer = wxDynamicCast(p, wxRichTextParagraphLayoutBox);
+ break;
+ }
+ p = p->GetParent();
+ }
+ }
- if (hit & wxRICHTEXT_HITTEST_BEFORE)
- {
- // If we're at the start of a line (but not first in para)
- // then we should keep the caret showing at the start of the line
- // by showing the m_caretAtLineStart flag.
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
- wxRichTextLine* line = GetBuffer().GetLineAtPosition(position);
-
- if (line && para && line->GetAbsoluteRange().GetStart() == position && para->GetRange().GetStart() != position)
- caretAtLineStart = true;
- position --;
- }
+ if (commonAncestor && firstContainer && otherContainer)
+ {
+ // We have now got a second container that shares a parent with the current or anchor object.
+ if (m_selectionState == wxRichTextCtrlSelectionState_Normal)
+ {
+ // Don't go into common-ancestor selection mode if we still have the same
+ // container.
+ if (otherContainer != firstContainer)
+ {
+ m_selectionState = wxRichTextCtrlSelectionState_CommonAncestor;
+ m_selectionAnchorObject = firstContainer;
+ m_selectionAnchor = firstContainer->GetRange().GetStart();
- if (m_caretPosition != position)
- {
- ExtendSelection(m_caretPosition, position, wxRICHTEXT_SHIFT_DOWN);
+ // The common ancestor, such as a table, returns the cell selection
+ // between the anchor and current position.
+ m_selection = commonAncestor->GetSelection(m_selectionAnchor, otherContainer->GetRange().GetStart());
+ }
+ }
+ else
+ {
+ m_selection = commonAncestor->GetSelection(m_selectionAnchor, otherContainer->GetRange().GetStart());
+ }
- MoveCaret(position, caretAtLineStart);
- SetDefaultStyleToCursorStyle();
+ Refresh();
+
+ if (otherContainer->AcceptsFocus())
+ SetFocusObject(otherContainer, false /* don't set caret and clear selection */);
+ MoveCaret(-1, false);
+ SetDefaultStyleToCursorStyle();
+ }
}
}
+
+ if (hitObj && m_dragging && hit != wxRICHTEXT_HITTEST_NONE && m_selectionState == wxRichTextCtrlSelectionState_Normal)
+ {
+ // TODO: test closeness
+ SetCaretPositionAfterClick(container, position, hit, true /* extend selection */);
+ }
}
/// Right-click
{
SetFocus();
+ wxClientDC dc(this);
+ PrepareDC(dc);
+ dc.SetFont(GetFont());
+
+ long position = 0;
+ wxPoint logicalPt = event.GetLogicalPosition(dc);
+ wxRichTextObject* hitObj = NULL;
+ wxRichTextObject* contextObj = NULL;
+ int hit = GetFocusObject()->HitTest(dc, logicalPt, position, & hitObj, & contextObj);
+
+ if (hitObj && hitObj->GetContainer() != GetFocusObject())
+ {
+ wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+ if (actualContainer && actualContainer->AcceptsFocus())
+ {
+ SetFocusObject(actualContainer, false /* don't set caret position yet */);
+ SetCaretPositionAfterClick(actualContainer, position, hit);
+ }
+ }
+
wxRichTextEvent cmdEvent(
wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK,
GetId());
cmdEvent.SetEventObject(this);
- cmdEvent.SetPosition(m_caretPosition+1);
+ cmdEvent.SetPosition(position);
+ if (hitObj)
+ cmdEvent.SetContainer(hitObj->GetContainer());
if (!GetEventHandler()->ProcessEvent(cmdEvent))
event.Skip();
GetId());
cmdEvent.SetEventObject(this);
cmdEvent.SetPosition(m_caretPosition+1);
+ cmdEvent.SetContainer(GetFocusObject());
if (!GetEventHandler()->ProcessEvent(cmdEvent))
{
GetId());
cmdEvent.SetEventObject(this);
cmdEvent.SetPosition(m_caretPosition+1);
+ cmdEvent.SetContainer(GetFocusObject());
if (!GetEventHandler()->ProcessEvent(cmdEvent))
event.Skip();
if (event.GetEventType() == wxEVT_KEY_DOWN)
{
- if (event.GetKeyCode() == WXK_LEFT ||
- event.GetKeyCode() == WXK_RIGHT ||
- event.GetKeyCode() == WXK_UP ||
- event.GetKeyCode() == WXK_DOWN ||
- event.GetKeyCode() == WXK_HOME ||
- event.GetKeyCode() == WXK_PAGEUP ||
- event.GetKeyCode() == WXK_PAGEDOWN ||
- event.GetKeyCode() == WXK_END ||
-
- event.GetKeyCode() == WXK_NUMPAD_LEFT ||
- event.GetKeyCode() == WXK_NUMPAD_RIGHT ||
- event.GetKeyCode() == WXK_NUMPAD_UP ||
- event.GetKeyCode() == WXK_NUMPAD_DOWN ||
- event.GetKeyCode() == WXK_NUMPAD_HOME ||
- event.GetKeyCode() == WXK_NUMPAD_PAGEUP ||
- event.GetKeyCode() == WXK_NUMPAD_PAGEDOWN ||
- event.GetKeyCode() == WXK_NUMPAD_END)
+ if (event.IsKeyInCategory(WXK_CATEGORY_NAVIGATION))
{
KeyboardNavigate(event.GetKeyCode(), flags);
return;
case WXK_NUMPAD_END:
case WXK_NUMPAD_BEGIN:
case WXK_NUMPAD_INSERT:
- case WXK_NUMPAD_DELETE:
case WXK_WINDOWS_LEFT:
{
return;
long pos = wxRichTextCtrl::FindNextWordPosition(-1);
if (pos < newPos)
{
- GetBuffer().DeleteRangeWithUndo(wxRichTextRange(pos+1, newPos), this);
+ GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(pos+1, newPos), this, & GetBuffer());
processed = true;
}
}
if (!processed)
- GetBuffer().DeleteRangeWithUndo(wxRichTextRange(newPos, newPos), this);
+ GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(newPos, newPos), this, & GetBuffer());
}
EndBatchUndo();
if (GetLastPosition() == -1)
{
- GetBuffer().Reset();
+ GetFocusObject()->Reset();
m_caretPosition = -1;
PositionCaret();
cmdEvent.SetEventObject(this);
cmdEvent.SetFlags(flags);
cmdEvent.SetPosition(m_caretPosition+1);
+ cmdEvent.SetContainer(GetFocusObject());
GetEventHandler()->ProcessEvent(cmdEvent);
Update();
{
wxString text;
text = wxRichTextLineBreakChar;
- GetBuffer().InsertTextWithUndo(newPos+1, text, this);
+ GetFocusObject()->InsertTextWithUndo(newPos+1, text, this, & GetBuffer());
m_caretAtLineStart = true;
PositionCaret();
}
else
- GetBuffer().InsertNewlineWithUndo(newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE|wxRICHTEXT_INSERT_INTERACTIVE);
+ GetFocusObject()->InsertNewlineWithUndo(newPos+1, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE|wxRICHTEXT_INSERT_INTERACTIVE);
EndBatchUndo();
SetDefaultStyleToCursorStyle();
cmdEvent.SetEventObject(this);
cmdEvent.SetFlags(flags);
cmdEvent.SetPosition(newPos+1);
+ cmdEvent.SetContainer(GetFocusObject());
if (!GetEventHandler()->ProcessEvent(cmdEvent))
{
long pos = wxRichTextCtrl::FindNextWordPosition(-1);
if (pos < newPos)
{
- GetBuffer().DeleteRangeWithUndo(wxRichTextRange(pos+1, newPos), this);
+ GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(pos+1, newPos), this, & GetBuffer());
processed = true;
}
}
if (!processed)
- GetBuffer().DeleteRangeWithUndo(wxRichTextRange(newPos, newPos), this);
+ GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(newPos, newPos), this, & GetBuffer());
}
EndBatchUndo();
if (GetLastPosition() == -1)
{
- GetBuffer().Reset();
+ GetFocusObject()->Reset();
m_caretPosition = -1;
PositionCaret();
cmdEvent.SetEventObject(this);
cmdEvent.SetFlags(flags);
cmdEvent.SetPosition(m_caretPosition+1);
+ cmdEvent.SetContainer(GetFocusObject());
GetEventHandler()->ProcessEvent(cmdEvent);
Update();
bool processed = DeleteSelectedContent(& newPos);
// Submit range in character positions, which are greater than caret positions,
- if (newPos < GetBuffer().GetRange().GetEnd()+1)
+ if (newPos < GetFocusObject()->GetOwnRange().GetEnd()+1)
{
if (event.CmdDown())
{
long pos = wxRichTextCtrl::FindNextWordPosition(1);
if (pos != -1 && (pos > newPos))
{
- GetBuffer().DeleteRangeWithUndo(wxRichTextRange(newPos+1, pos), this);
+ GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(newPos+1, pos), this, & GetBuffer());
processed = true;
}
}
- if (!processed)
- GetBuffer().DeleteRangeWithUndo(wxRichTextRange(newPos+1, newPos+1), this);
+ if (!processed && newPos < (GetLastPosition()-1))
+ GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(newPos+1, newPos+1), this, & GetBuffer());
}
EndBatchUndo();
if (GetLastPosition() == -1)
{
- GetBuffer().Reset();
+ GetFocusObject()->Reset();
m_caretPosition = -1;
PositionCaret();
cmdEvent.SetEventObject(this);
cmdEvent.SetFlags(flags);
cmdEvent.SetPosition(m_caretPosition+1);
+ cmdEvent.SetContainer(GetFocusObject());
GetEventHandler()->ProcessEvent(cmdEvent);
Update();
#ifdef __WXMAC__
if (event.CmdDown())
#else
- if (event.CmdDown() || event.AltDown())
+ // Fixes AltGr+key with European input languages on Windows
+ if ((event.CmdDown() && !event.AltDown()) || (event.AltDown() && !event.CmdDown()))
#endif
{
event.Skip();
cmdEvent.SetCharacter((wxChar) keycode);
#endif
cmdEvent.SetPosition(m_caretPosition+1);
+ cmdEvent.SetContainer(GetFocusObject());
if (keycode == wxT('\t'))
{
// See if we need to promote or demote the selection or paragraph at the cursor
// position, instead of inserting a tab.
long pos = GetAdjustedCaretPosition(GetCaretPosition());
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos);
if (para && para->GetRange().GetStart() == pos && para->GetAttributes().HasListStyleName())
{
wxRichTextRange range;
#else
wxString str = (wxChar) event.GetKeyCode();
#endif
- GetBuffer().InsertTextWithUndo(newPos+1, str, this, 0);
+ GetFocusObject()->InsertTextWithUndo(newPos+1, str, this, & GetBuffer(), 0);
EndBatchUndo();
SetDefaultStyleToCursorStyle();
ScrollIntoView(m_caretPosition, WXK_RIGHT);
+ cmdEvent.SetPosition(m_caretPosition);
GetEventHandler()->ProcessEvent(cmdEvent);
Update();
{
if (HasSelection())
{
- long pos = m_selectionRange.GetStart();
- GetBuffer().DeleteRangeWithUndo(m_selectionRange, this);
- m_selectionRange.SetRange(-2, -2);
+ long pos = m_selection.GetRange().GetStart();
+ wxRichTextRange range = m_selection.GetRange();
+
+ // SelectAll causes more to be selected than doing it interactively,
+ // and causes a new paragraph to be inserted. So for multiline buffers,
+ // don't delete the final position.
+ if (range.GetEnd() == GetLastPosition() && GetNumberOfLines() > 0)
+ range.SetEnd(range.GetEnd()-1);
+
+ GetFocusObject()->DeleteRangeWithUndo(range, this, & GetBuffer());
+ m_selection.Reset();
+ m_selectionState = wxRichTextCtrlSelectionState_Normal;
if (newPos)
*newPos = pos-1;
if (oldPos == newPos)
return false;
- wxRichTextRange oldSelection = m_selectionRange;
+ wxRichTextSelection oldSelection = m_selection;
+
+ m_selection.SetContainer(GetFocusObject());
+
+ wxRichTextRange oldRange;
+ if (m_selection.IsValid())
+ oldRange = m_selection.GetRange();
+ else
+ oldRange = wxRICHTEXT_NO_SELECTION;
+ wxRichTextRange newRange;
// If not currently selecting, start selecting
- if (m_selectionRange.GetStart() == -2)
+ if (oldRange.GetStart() == -2)
{
m_selectionAnchor = oldPos;
if (oldPos > newPos)
- m_selectionRange.SetRange(newPos+1, oldPos);
+ newRange.SetRange(newPos+1, oldPos);
else
- m_selectionRange.SetRange(oldPos+1, newPos);
+ newRange.SetRange(oldPos+1, newPos);
}
else
{
// Always ensure that the selection range start is greater than
// the end.
if (newPos > m_selectionAnchor)
- m_selectionRange.SetRange(m_selectionAnchor+1, newPos);
+ newRange.SetRange(m_selectionAnchor+1, newPos);
else if (newPos == m_selectionAnchor)
- m_selectionRange = wxRichTextRange(-2, -2);
+ newRange = wxRichTextRange(-2, -2);
else
- m_selectionRange.SetRange(newPos+1, m_selectionAnchor);
+ newRange.SetRange(newPos+1, m_selectionAnchor);
}
- RefreshForSelectionChange(oldSelection, m_selectionRange);
+ m_selection.SetRange(newRange);
+
+ RefreshForSelectionChange(oldSelection, m_selection);
- if (m_selectionRange.GetStart() > m_selectionRange.GetEnd())
+ if (newRange.GetStart() > newRange.GetEnd())
{
wxLogDebug(wxT("Strange selection range"));
}
wxSize clientSize = GetClientSize();
+ int leftMargin, rightMargin, topMargin, bottomMargin;
+
+ {
+ wxClientDC dc(this);
+ wxRichTextObject::GetTotalMargin(dc, & GetBuffer(), GetBuffer().GetAttributes(), leftMargin, rightMargin,
+ topMargin, bottomMargin);
+ }
+// clientSize.y -= GetBuffer().GetBottomMargin();
+ clientSize.y -= bottomMargin;
+
+ if (GetWindowStyle() & wxRE_CENTRE_CARET)
+ {
+ int y = rect.y - GetClientSize().y/2;
+ int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
+ if (y >= 0 && (y + clientSize.y) < GetBuffer().GetCachedSize().y)
+ {
+ if (startYUnits != yUnits)
+ {
+ SetScrollbars(ppuX, ppuY, sxUnits, syUnits, 0, yUnits);
+ scrolled = true;
+ }
+#if !wxRICHTEXT_USE_OWN_CARET
+ if (scrolled)
+#endif
+ PositionCaret();
+
+ return scrolled;
+ }
+ }
+
// Going down
if (keyCode == WXK_DOWN || keyCode == WXK_NUMPAD_DOWN ||
keyCode == WXK_RIGHT || keyCode == WXK_NUMPAD_RIGHT ||
scrolled = true;
}
}
- else if (rect.y < startY)
+ else if (rect.y < (startY + GetBuffer().GetTopMargin()))
{
// Make it scroll so this item is at the top
// of the window
- int y = rect.y ;
+ int y = rect.y - GetBuffer().GetTopMargin();
int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
if (startYUnits != yUnits)
keyCode == WXK_HOME || keyCode == WXK_NUMPAD_HOME ||
keyCode == WXK_PAGEUP || keyCode == WXK_NUMPAD_PAGEUP )
{
- if (rect.y < startY)
+ if (rect.y < (startY + GetBuffer().GetBottomMargin()))
{
// Make it scroll so this item is at the top
// of the window
- int y = rect.y ;
+ int y = rect.y - GetBuffer().GetTopMargin();
int yUnits = (int) (0.5 + ((float) y)/(float) ppuY);
if (startYUnits != yUnits)
wxRect rect = line->GetRect();
wxSize clientSize = GetClientSize();
+ clientSize.y -= GetBuffer().GetBottomMargin();
- return (rect.GetBottom() > startY) && (rect.GetTop() < (startY + clientSize.y));
+ return (rect.GetTop() >= (startY + GetBuffer().GetTopMargin())) && (rect.GetBottom() <= (startY + clientSize.y));
}
void wxRichTextCtrl::SetCaretPosition(long position, bool showAtLineStart)
/// to the start of the next, which may be the exact same caret position.
void wxRichTextCtrl::MoveCaretForward(long oldPosition)
{
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(oldPosition);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(oldPosition);
// Only do the check if we're not at the end of the paragraph (where things work OK
// anyway)
if (para && (oldPosition != para->GetRange().GetEnd() - 1))
{
- wxRichTextLine* line = GetBuffer().GetLineAtPosition(oldPosition);
+ wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(oldPosition);
if (line)
{
/// to the start of the next, which may be the exact same caret position.
void wxRichTextCtrl::MoveCaretBack(long oldPosition)
{
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(oldPosition);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(oldPosition);
// Only do the check if we're not at the start of the paragraph (where things work OK
// anyway)
if (para && (oldPosition != para->GetRange().GetStart()))
{
- wxRichTextLine* line = GetBuffer().GetLineAtPosition(oldPosition);
+ wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(oldPosition);
if (line)
{
/// Move right
bool wxRichTextCtrl::MoveRight(int noPositions, int flags)
{
- long endPos = GetBuffer().GetRange().GetEnd();
+ long endPos = GetFocusObject()->GetOwnRange().GetEnd();
if (m_caretPosition + noPositions < endPos)
{
return false;
}
+// Find the caret position for the combination of hit-test flags and character position.
+// Returns the caret position and also an indication of where to place the caret (caretLineStart)
+// since this is ambiguous (same position used for end of line and start of next).
+long wxRichTextCtrl::FindCaretPositionForCharacterPosition(long position, int hitTestFlags, wxRichTextParagraphLayoutBox* container,
+ bool& caretLineStart)
+{
+ // If end of previous line, and hitTest is wxRICHTEXT_HITTEST_BEFORE,
+ // we want to be at the end of the last line but with m_caretAtLineStart set to true,
+ // so we view the caret at the start of the line.
+ caretLineStart = false;
+ long caretPosition = position;
+
+ if (hitTestFlags & wxRICHTEXT_HITTEST_BEFORE)
+ {
+ wxRichTextLine* thisLine = container->GetLineAtPosition(position-1);
+ wxRichTextRange lineRange;
+ if (thisLine)
+ lineRange = thisLine->GetAbsoluteRange();
+
+ if (thisLine && (position-1) == lineRange.GetEnd())
+ {
+ caretPosition --;
+ caretLineStart = true;
+ }
+ else
+ {
+ wxRichTextParagraph* para = container->GetParagraphAtPosition(position);
+ if (para && para->GetRange().GetStart() == position)
+ caretPosition --;
+ }
+ }
+ return caretPosition;
+}
+
/// Move up
bool wxRichTextCtrl::MoveUp(int noLines, int flags)
{
if (!GetCaret())
return false;
- long lineNumber = GetBuffer().GetVisibleLineNumber(m_caretPosition, true, m_caretAtLineStart);
+ long lineNumber = GetFocusObject()->GetVisibleLineNumber(m_caretPosition, true, m_caretAtLineStart);
wxPoint pt = GetCaret()->GetPosition();
long newLine = lineNumber + noLines;
+ bool notInThisObject = false;
if (lineNumber != -1)
{
if (noLines > 0)
{
- long lastLine = GetBuffer().GetVisibleLineNumber(GetBuffer().GetRange().GetEnd());
-
+ long lastLine = GetFocusObject()->GetVisibleLineNumber(GetFocusObject()->GetOwnRange().GetEnd());
if (newLine > lastLine)
- return false;
+ notInThisObject = true;
}
else
{
if (newLine < 0)
- return false;
+ notInThisObject = true;
}
}
- wxRichTextLine* lineObj = GetBuffer().GetLineForVisibleLineNumber(newLine);
- if (lineObj)
+ wxRichTextParagraphLayoutBox* container = GetFocusObject();
+ int hitTestFlags = wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS|wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS;
+
+ if (notInThisObject)
{
- pt.y = lineObj->GetAbsolutePosition().y + 2;
+ // If we know we're navigating out of the current object,
+ // try to find an object anywhere in the buffer at the new position (up or down a bit)
+ container = & GetBuffer();
+ hitTestFlags &= ~wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS;
+
+ if (noLines > 0) // going down
+ {
+ pt.y = GetFocusObject()->GetPosition().y + GetFocusObject()->GetCachedSize().y + 2;
+ }
+ else // going up
+ {
+ pt.y = GetFocusObject()->GetPosition().y - 2;
+ }
}
else
- return false;
+ {
+ wxRichTextLine* lineObj = GetFocusObject()->GetLineForVisibleLineNumber(newLine);
+ if (lineObj)
+ pt.y = lineObj->GetAbsolutePosition().y + 2;
+ else
+ return false;
+ }
long newPos = 0;
wxClientDC dc(this);
PrepareDC(dc);
dc.SetFont(GetFont());
- int hitTest = GetBuffer().HitTest(dc, pt, newPos);
+ wxRichTextObject* hitObj = NULL;
+ wxRichTextObject* contextObj = NULL;
+ int hitTest = container->HitTest(dc, pt, newPos, & hitObj, & contextObj, hitTestFlags);
- if (hitTest != wxRICHTEXT_HITTEST_NONE)
+ if (hitObj &&
+ ((hitTest & wxRICHTEXT_HITTEST_NONE) == 0) &&
+ (! (hitObj == (& m_buffer) && ((hitTest & wxRICHTEXT_HITTEST_OUTSIDE) != 0))) // outside the buffer counts as 'do nothing'
+ )
{
- // If end of previous line, and hitTest is wxRICHTEXT_HITTEST_BEFORE,
- // we want to be at the end of the last line but with m_caretAtLineStart set to true,
- // so we view the caret at the start of the line.
- bool caretLineStart = false;
- if (hitTest & wxRICHTEXT_HITTEST_BEFORE)
+ if (notInThisObject)
{
- wxRichTextLine* thisLine = GetBuffer().GetLineAtPosition(newPos-1);
- wxRichTextRange lineRange;
- if (thisLine)
- lineRange = thisLine->GetAbsoluteRange();
-
- if (thisLine && (newPos-1) == lineRange.GetEnd())
+ wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+ if (actualContainer && actualContainer != GetFocusObject() && actualContainer->AcceptsFocus())
{
- newPos --;
- caretLineStart = true;
- }
- else
- {
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(newPos);
- if (para && para->GetRange().GetStart() == newPos)
- newPos --;
+ SetFocusObject(actualContainer, false /* don't set caret position yet */);
+
+ container = actualContainer;
}
}
- long newSelEnd = newPos;
+ bool caretLineStart = true;
+ long caretPosition = FindCaretPositionForCharacterPosition(newPos, hitTest, container, caretLineStart);
+ long newSelEnd = caretPosition;
+ bool extendSel;
+
+ if (notInThisObject)
+ extendSel = false;
+ else
+ extendSel = ExtendSelection(m_caretPosition, newSelEnd, flags);
- bool extendSel = ExtendSelection(m_caretPosition, newSelEnd, flags);
if (!extendSel)
SelectNone();
- SetCaretPosition(newPos, caretLineStart);
+ SetCaretPosition(caretPosition, caretLineStart);
PositionCaret();
SetDefaultStyleToCursorStyle();
/// Move to the end of the paragraph
bool wxRichTextCtrl::MoveToParagraphEnd(int flags)
{
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(m_caretPosition, true);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(m_caretPosition, true);
if (para)
{
long newPos = para->GetRange().GetEnd() - 1;
/// Move to the start of the paragraph
bool wxRichTextCtrl::MoveToParagraphStart(int flags)
{
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(m_caretPosition, true);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(m_caretPosition, true);
if (para)
{
long newPos = para->GetRange().GetStart() - 1;
if (!extendSel)
SelectNone();
- wxRichTextParagraph* para = GetBuffer().GetParagraphForLine(line);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphForLine(line);
SetCaretPosition(newPos, para->GetRange().GetStart() != lineRange.GetStart());
PositionCaret();
/// Move to the end of the buffer
bool wxRichTextCtrl::MoveEnd(int flags)
{
- long endPos = GetBuffer().GetRange().GetEnd()-1;
+ long endPos = GetFocusObject()->GetOwnRange().GetEnd()-1;
if (m_caretPosition != endPos)
{
wxSize clientSize = GetClientSize();
int newY = line->GetAbsolutePosition().y + noPages*clientSize.y;
- wxRichTextLine* newLine = GetBuffer().GetLineAtYPosition(newY);
+ wxRichTextLine* newLine = GetFocusObject()->GetLineAtYPosition(newY);
if (newLine)
{
wxRichTextRange lineRange = newLine->GetAbsoluteRange();
long pos = lineRange.GetStart()-1;
if (pos != m_caretPosition)
{
- wxRichTextParagraph* para = GetBuffer().GetParagraphForLine(newLine);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphForLine(newLine);
bool extendSel = ExtendSelection(m_caretPosition, pos, flags);
if (!extendSel)
// Finds the caret position for the next word
long wxRichTextCtrl::FindNextWordPosition(int direction) const
{
- long endPos = GetBuffer().GetRange().GetEnd();
+ long endPos = GetFocusObject()->GetOwnRange().GetEnd();
if (direction > 0)
{
while (i < endPos && i > -1)
{
// i is in character, not caret positions
- wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
- wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+ wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i));
+ wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false);
if (line && (i == line->GetAbsoluteRange().GetEnd()))
{
break;
while (i < endPos && i > -1)
{
// i is in character, not caret positions
- wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
- wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+ wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i));
+ wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false);
if (line && (i == line->GetAbsoluteRange().GetEnd()))
return wxMax(-1, i);
while (i < endPos && i > -1)
{
// i is in character, not caret positions
- wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
- wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+ wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i));
+ wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false);
if (text.empty() || (line && (i == line->GetAbsoluteRange().GetStart()))) // End of paragraph, or maybe an image
break;
while (i < endPos && i > -1)
{
// i is in character, not caret positions
- wxString text = GetBuffer().GetTextForRange(wxRichTextRange(i, i));
- wxRichTextLine* line = GetBuffer().GetLineAtPosition(i, false);
+ wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(i, i));
+ wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(i, false);
if (line && line->GetAbsoluteRange().GetStart() == i)
return i-1;
long pos = FindNextWordPosition(-1);
if (pos != m_caretPosition)
{
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos, true);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos, true);
bool extendSel = ExtendSelection(m_caretPosition, pos, flags);
if (!extendSel)
long pos = FindNextWordPosition(1);
if (pos != m_caretPosition)
{
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(pos, true);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos, true);
bool extendSel = ExtendSelection(m_caretPosition, pos, flags);
if (!extendSel)
void wxRichTextCtrl::OnSize(wxSizeEvent& event)
{
// Only do sizing optimization for large buffers
- if (GetBuffer().GetRange().GetEnd() > m_delayedLayoutThreshold)
+ if (GetBuffer().GetOwnRange().GetEnd() > m_delayedLayoutThreshold)
{
m_fullLayoutRequired = true;
m_fullLayoutTime = wxGetLocalTimeMillis();
event.Skip();
}
+// Force any pending layout due to large buffer
+void wxRichTextCtrl::ForceDelayedLayout()
+{
+ if (m_fullLayoutRequired)
+ {
+ m_fullLayoutRequired = false;
+ m_fullLayoutTime = 0;
+ GetBuffer().Invalidate(wxRICHTEXT_ALL);
+ ShowPosition(m_fullLayoutSavedPosition);
+ Refresh(false);
+ Update();
+ }
+}
/// Idle-time processing
void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
int pixelsPerUnit = 5;
wxSize clientSize = GetClientSize();
- int maxHeight = GetBuffer().GetCachedSize().y;
+ int maxHeight = GetBuffer().GetCachedSize().y + GetBuffer().GetTopMargin();
// Round up so we have at least maxHeight pixels
int unitsY = (int) (((float)maxHeight/(float)pixelsPerUnit) + 0.5);
return;
// Don't set scrollbars if there were none before, and there will be none now.
- if (oldPPUY != 0 && (oldVirtualSizeY < clientSize.y) && (unitsY*pixelsPerUnit < clientSize.y))
+ if (oldPPUY != 0 && (oldVirtualSizeY*oldPPUY < clientSize.y) && (unitsY*pixelsPerUnit < clientSize.y))
return;
// Move to previous scroll position if
/// Add a new paragraph of text to the end of the buffer
wxRichTextRange wxRichTextCtrl::AddParagraph(const wxString& text)
{
- wxRichTextRange range = GetBuffer().AddParagraph(text);
+ wxRichTextRange range = GetFocusObject()->AddParagraph(text);
+ GetBuffer().Invalidate();
LayoutContent();
return range;
}
/// Add an image
wxRichTextRange wxRichTextCtrl::AddImage(const wxImage& image)
{
- wxRichTextRange range = GetBuffer().AddImage(image);
+ wxRichTextRange range = GetFocusObject()->AddImage(image);
+ GetBuffer().Invalidate();
LayoutContent();
return range;
}
void wxRichTextCtrl::SelectAll()
{
- SetSelection(0, GetLastPosition()+1);
- m_selectionAnchor = -1;
+ SetSelection(-1, -1);
}
/// Select none
void wxRichTextCtrl::SelectNone()
{
- if (!(GetSelectionRange() == wxRichTextRange(-2, -2)))
+ if (m_selection.IsValid())
{
- wxRichTextRange oldSelection = m_selectionRange;
+ wxRichTextSelection oldSelection = m_selection;
- m_selectionRange = wxRichTextRange(-2, -2);
+ m_selection.Reset();
- RefreshForSelectionChange(oldSelection, m_selectionRange);
+ RefreshForSelectionChange(oldSelection, m_selection);
}
m_selectionAnchor = -2;
+ m_selectionAnchorObject = NULL;
+ m_selectionState = wxRichTextCtrlSelectionState_Normal;
}
static bool wxIsWordDelimiter(const wxString& text)
/// Select the word at the given character position
bool wxRichTextCtrl::SelectWord(long position)
{
- if (position < 0 || position > GetBuffer().GetRange().GetEnd())
+ if (position < 0 || position > GetFocusObject()->GetOwnRange().GetEnd())
return false;
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(position);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(position);
if (!para)
return false;
for (positionStart = position; positionStart >= para->GetRange().GetStart(); positionStart --)
{
- wxString text = GetBuffer().GetTextForRange(wxRichTextRange(positionStart, positionStart));
+ wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(positionStart, positionStart));
if (wxIsWordDelimiter(text))
{
positionStart ++;
for (positionEnd = position; positionEnd < para->GetRange().GetEnd(); positionEnd ++)
{
- wxString text = GetBuffer().GetTextForRange(wxRichTextRange(positionEnd, positionEnd));
+ wxString text = GetFocusObject()->GetTextForRange(wxRichTextRange(positionEnd, positionEnd));
if (wxIsWordDelimiter(text))
{
positionEnd --;
// so convert
wxPoint pt2 = GetLogicalPoint(pt);
- int hit = ((wxRichTextCtrl*)this)->GetBuffer().HitTest(dc, pt2, *pos);
+ wxRichTextObject* hitObj = NULL;
+ wxRichTextObject* contextObj = NULL;
+ int hit = ((wxRichTextCtrl*)this)->GetFocusObject()->HitTest(dc, pt2, *pos, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS);
if ((hit & wxRICHTEXT_HITTEST_BEFORE) && (hit & wxRICHTEXT_HITTEST_OUTSIDE))
return wxTE_HT_BEFORE;
// set/get the controls text
// ----------------------------------------------------------------------------
-wxString wxRichTextCtrl::GetValue() const
+wxString wxRichTextCtrl::DoGetValue() const
{
return GetBuffer().GetText();
}
wxString wxRichTextCtrl::GetRange(long from, long to) const
{
// Public API for range is different from internals
- return GetBuffer().GetTextForRange(wxRichTextRange(from, to-1));
+ return GetFocusObject()->GetTextForRange(wxRichTextRange(from, to-1));
}
void wxRichTextCtrl::DoSetValue(const wxString& value, int flags)
{
// Don't call Clear here, since it always sends a text updated event
m_buffer.ResetAndClearCommands();
- m_buffer.SetDirty(true);
+ m_buffer.Invalidate(wxRICHTEXT_ALL);
m_caretPosition = -1;
m_caretPositionForDefaultStyle = -2;
m_caretAtLineStart = false;
- m_selectionRange.SetRange(-2, -2);
+ m_selection.Reset();
+ m_selectionState = wxRichTextCtrlSelectionState_Normal;
Scroll(0,0);
{
wxString valueUnix = wxTextFile::Translate(value, wxTextFileType_Unix);
- GetBuffer().InsertTextWithUndo(m_caretPosition+1, valueUnix, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+ GetFocusObject()->InsertTextWithUndo(m_caretPosition+1, valueUnix, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
if ( flags & SetValue_SendEvent )
wxTextCtrl::SendTextUpdatedEvent(this);
}
/// Write an image at the current insertion point
-bool wxRichTextCtrl::WriteImage(const wxImage& image, wxBitmapType bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxImage& image, wxBitmapType bitmapType, const wxRichTextAttr& textAttr)
{
wxRichTextImageBlock imageBlock;
wxImage image2 = image;
if (imageBlock.MakeImageBlock(image2, bitmapType))
- return WriteImage(imageBlock);
+ return WriteImage(imageBlock, textAttr);
return false;
}
-bool wxRichTextCtrl::WriteImage(const wxString& filename, wxBitmapType bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxString& filename, wxBitmapType bitmapType, const wxRichTextAttr& textAttr)
{
wxRichTextImageBlock imageBlock;
wxImage image;
if (imageBlock.MakeImageBlock(filename, bitmapType, image, false))
- return WriteImage(imageBlock);
+ return WriteImage(imageBlock, textAttr);
return false;
}
-bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock)
+bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock, const wxRichTextAttr& textAttr)
{
- return GetBuffer().InsertImageWithUndo(m_caretPosition+1, imageBlock, this);
+ return GetFocusObject()->InsertImageWithUndo(m_caretPosition+1, imageBlock, this, & GetBuffer(), 0, textAttr);
}
-bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType, const wxRichTextAttr& textAttr)
{
if (bitmap.Ok())
{
wxImage image = bitmap.ConvertToImage();
if (image.Ok() && imageBlock.MakeImageBlock(image, bitmapType))
- return WriteImage(imageBlock);
+ return WriteImage(imageBlock, textAttr);
}
return false;
}
+// Write a text box at the current insertion point.
+wxRichTextBox* wxRichTextCtrl::WriteTextBox(const wxRichTextAttr& textAttr)
+{
+ wxRichTextBox* textBox = new wxRichTextBox;
+ textBox->SetAttributes(textAttr);
+ textBox->SetParent(& GetBuffer()); // set parent temporarily for AddParagraph to use correct style
+ textBox->AddParagraph(wxEmptyString);
+ textBox->SetParent(NULL);
+
+ // The object returned is the one actually inserted into the buffer,
+ // while the original one is deleted.
+ wxRichTextObject* obj = GetFocusObject()->InsertObjectWithUndo(m_caretPosition+1, textBox, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+ wxRichTextBox* box = wxDynamicCast(obj, wxRichTextBox);
+ return box;
+}
+
+// Write a table at the current insertion point, returning the table.
+wxRichTextTable* wxRichTextCtrl::WriteTable(int rows, int cols, const wxRichTextAttr& tableAttr, const wxRichTextAttr& cellAttr)
+{
+ wxASSERT(rows > 0 && cols > 0);
+
+ if (rows <= 0 || cols <= 0)
+ return NULL;
+
+ wxRichTextTable* table = new wxRichTextTable;
+ table->SetAttributes(tableAttr);
+ table->SetParent(& GetBuffer()); // set parent temporarily for AddParagraph to use correct style
+
+ table->CreateTable(rows, cols);
+
+ table->SetParent(NULL);
+
+ int i, j;
+ for (j = 0; j < rows; j++)
+ {
+ for (i = 0; i < cols; i++)
+ {
+ table->GetCell(j, i)->GetAttributes() = cellAttr;
+ }
+ }
+
+ // The object returned is the one actually inserted into the buffer,
+ // while the original one is deleted.
+ wxRichTextObject* obj = GetFocusObject()->InsertObjectWithUndo(m_caretPosition+1, table, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+ wxRichTextTable* tableResult = wxDynamicCast(obj, wxRichTextTable);
+ return tableResult;
+}
+
+
/// Insert a newline (actually paragraph) at the current insertion point.
bool wxRichTextCtrl::Newline()
{
- return GetBuffer().InsertNewlineWithUndo(m_caretPosition+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+ return GetFocusObject()->InsertNewlineWithUndo(m_caretPosition+1, this, & GetBuffer(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
}
/// Insert a line break at the current insertion point.
{
wxString text;
text = wxRichTextLineBreakChar;
- return GetBuffer().InsertTextWithUndo(m_caretPosition+1, text, this);
+ return GetFocusObject()->InsertTextWithUndo(m_caretPosition+1, text, this, & GetBuffer());
}
// ----------------------------------------------------------------------------
bool wxRichTextCtrl::HasSelection() const
{
- return m_selectionRange.GetStart() != -2 && m_selectionRange.GetEnd() != -2;
+ return (m_selection.IsValid() && m_selection.GetContainer() == GetFocusObject());
+}
+
+bool wxRichTextCtrl::HasUnfocusedSelection() const
+{
+ return m_selection.IsValid();
}
bool wxRichTextCtrl::CanCopy() const
// Accessors
// ----------------------------------------------------------------------------
+void wxRichTextCtrl::SetContextMenu(wxMenu* menu)
+{
+ if (m_contextMenu && m_contextMenu != menu)
+ delete m_contextMenu;
+ m_contextMenu = menu;
+}
+
void wxRichTextCtrl::SetEditable(bool editable)
{
m_editable = editable;
m_caretPosition = pos - 1;
PositionCaret();
+
+ SetDefaultStyleToCursorStyle();
}
void wxRichTextCtrl::SetInsertionPointEnd()
wxTextPos wxRichTextCtrl::GetLastPosition() const
{
- return GetBuffer().GetRange().GetEnd();
+ return GetFocusObject()->GetOwnRange().GetEnd();
}
// If the return values from and to are the same, there is no
// selection.
void wxRichTextCtrl::GetSelection(long* from, long* to) const
{
- *from = m_selectionRange.GetStart();
- *to = m_selectionRange.GetEnd();
- if ((*to) != -1 && (*to) != -2)
+ if (m_selection.IsValid())
+ {
+ *from = m_selection.GetRange().GetStart();
+ *to = m_selection.GetRange().GetEnd();
(*to) ++;
+ }
+ else
+ {
+ *from = -2;
+ *to = -2;
+ }
}
bool wxRichTextCtrl::IsEditable() const
to = GetLastPosition()+1;
}
- DoSetSelection(from, to);
-}
-
-void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCaret))
-{
if (from == to)
{
SelectNone();
}
else
{
- wxRichTextRange oldSelection = m_selectionRange;
- m_selectionAnchor = from;
- m_selectionRange.SetRange(from, to-1);
- if (from > -2)
- m_caretPosition = from-1;
+ wxRichTextSelection oldSelection = m_selection;
+
+ m_selectionAnchor = from-1;
+ m_selectionAnchorObject = NULL;
+ m_selection.Set(wxRichTextRange(from, to-1), GetFocusObject());
- RefreshForSelectionChange(oldSelection, m_selectionRange);
+ m_caretPosition = wxMax(-1, to-1);
+
+ RefreshForSelectionChange(oldSelection, m_selection);
PositionCaret();
}
}
{
SelectNone();
- GetBuffer().DeleteRangeWithUndo(wxRichTextRange(from, to-1), this);
+ GetFocusObject()->DeleteRangeWithUndo(wxRichTextRange(from, to-1), this, & GetBuffer());
LayoutContent();
if (!IsFrozen())
int wxRichTextCtrl::GetNumberOfLines() const
{
- return GetBuffer().GetParagraphCount();
+ return GetFocusObject()->GetParagraphCount();
}
// ----------------------------------------------------------------------------
long wxRichTextCtrl::XYToPosition(long x, long y) const
{
- return GetBuffer().XYToPosition(x, y);
+ return GetFocusObject()->XYToPosition(x, y);
}
bool wxRichTextCtrl::PositionToXY(long pos, long *x, long *y) const
{
- return GetBuffer().PositionToXY(pos, x, y);
+ return GetFocusObject()->PositionToXY(pos, x, y);
}
// ----------------------------------------------------------------------------
int wxRichTextCtrl::GetLineLength(long lineNo) const
{
- return GetBuffer().GetParagraphLength(lineNo);
+ return GetFocusObject()->GetParagraphLength(lineNo);
}
wxString wxRichTextCtrl::GetLineText(long lineNo) const
{
- return GetBuffer().GetParagraphText(lineNo);
+ return GetFocusObject()->GetParagraphText(lineNo);
}
// ----------------------------------------------------------------------------
bool wxRichTextCtrl::CanUndo() const
{
- return GetCommandProcessor()->CanUndo();
+ return GetCommandProcessor()->CanUndo() && IsEditable();
}
bool wxRichTextCtrl::CanRedo() const
{
- return GetCommandProcessor()->CanRedo();
+ return GetCommandProcessor()->CanRedo() && IsEditable();
}
// ----------------------------------------------------------------------------
void wxRichTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event))
{
- SelectAll();
+ if (GetLastPosition() > 0)
+ SelectAll();
}
void wxRichTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
event.Enable(GetLastPosition() > 0);
}
+void wxRichTextCtrl::OnProperties(wxCommandEvent& event)
+{
+ int idx = event.GetId() - wxID_RICHTEXT_PROPERTIES1;
+ if (idx >= 0 && idx < m_contextMenuPropertiesInfo.GetCount())
+ {
+ wxRichTextObject* obj = m_contextMenuPropertiesInfo.GetObject(idx);
+ if (obj && obj->CanEditProperties())
+ obj->EditProperties(this, & GetBuffer());
+
+ m_contextMenuPropertiesInfo.Clear();
+ }
+}
+
+void wxRichTextCtrl::OnUpdateProperties(wxUpdateUIEvent& event)
+{
+ int idx = event.GetId() - wxID_RICHTEXT_PROPERTIES1;
+ event.Enable(idx >= 0 && idx < m_contextMenuPropertiesInfo.GetCount());
+}
+
void wxRichTextCtrl::OnContextMenu(wxContextMenuEvent& event)
{
if (event.GetEventObject() != this)
return;
}
- if (!m_contextMenu)
+ wxClientDC dc(this);
+ PrepareDC(dc);
+ dc.SetFont(GetFont());
+
+ long position = 0;
+ wxPoint pt = event.GetPosition();
+ wxPoint logicalPt = GetLogicalPoint(ScreenToClient(pt));
+ wxRichTextObject* hitObj = NULL;
+ wxRichTextObject* contextObj = NULL;
+ int hit = GetFocusObject()->HitTest(dc, logicalPt, position, & hitObj, & contextObj);
+
+ m_contextMenuPropertiesInfo.Clear();
+
+ if (hit == wxRICHTEXT_HITTEST_ON || hit == wxRICHTEXT_HITTEST_BEFORE || hit == wxRICHTEXT_HITTEST_AFTER)
{
- m_contextMenu = new wxMenu;
- m_contextMenu->Append(wxID_UNDO, _("&Undo"));
- m_contextMenu->Append(wxID_REDO, _("&Redo"));
- m_contextMenu->AppendSeparator();
- m_contextMenu->Append(wxID_CUT, _("Cu&t"));
- m_contextMenu->Append(wxID_COPY, _("&Copy"));
- m_contextMenu->Append(wxID_PASTE, _("&Paste"));
- m_contextMenu->Append(wxID_CLEAR, _("&Delete"));
- m_contextMenu->AppendSeparator();
- m_contextMenu->Append(wxID_SELECTALL, _("Select &All"));
+ wxRichTextParagraphLayoutBox* actualContainer = wxDynamicCast(contextObj, wxRichTextParagraphLayoutBox);
+ if (hitObj && actualContainer)
+ {
+ if (actualContainer->AcceptsFocus())
+ {
+ SetFocusObject(actualContainer, false /* don't set caret position yet */);
+ SetCaretPositionAfterClick(actualContainer, position, hit);
+ }
+
+ m_contextMenuPropertiesInfo.AddItems(actualContainer, hitObj);
+ }
+ else
+ m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL);
+ }
+ else
+ {
+ m_contextMenuPropertiesInfo.AddItems(GetFocusObject(), NULL);
+ }
+
+ if (m_contextMenu)
+ {
+ m_contextMenuPropertiesInfo.AddMenuItems(m_contextMenu);
+ PopupMenu(m_contextMenu);
}
- PopupMenu(m_contextMenu);
- return;
}
bool wxRichTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
{
- return GetBuffer().SetStyle(wxRichTextRange(start, end-1), wxTextAttr(style));
+ return GetFocusObject()->SetStyle(wxRichTextRange(start, end-1), wxRichTextAttr(style));
+}
+
+bool wxRichTextCtrl::SetStyle(long start, long end, const wxRichTextAttr& style)
+{
+ return GetFocusObject()->SetStyle(wxRichTextRange(start, end-1), style);
}
bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxTextAttr& style)
{
- return GetBuffer().SetStyle(range.ToInternal(), style);
+ return GetFocusObject()->SetStyle(range.ToInternal(), wxRichTextAttr(style));
+}
+
+bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style)
+{
+ return GetFocusObject()->SetStyle(range.ToInternal(), style);
+}
+
+void wxRichTextCtrl::SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr)
+{
+ GetFocusObject()->SetStyle(obj, textAttr);
}
// extended style setting operation with flags including:
// wxRICHTEXT_SETSTYLE_WITH_UNDO, wxRICHTEXT_SETSTYLE_OPTIMIZE, wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY.
// see richtextbuffer.h for more details.
-bool wxRichTextCtrl::SetStyleEx(const wxRichTextRange& range, const wxTextAttr& style, int flags)
+bool wxRichTextCtrl::SetStyleEx(const wxRichTextRange& range, const wxRichTextAttr& style, int flags)
{
- return GetBuffer().SetStyle(range.ToInternal(), style, flags);
+ return GetFocusObject()->SetStyle(range.ToInternal(), style, flags);
}
bool wxRichTextCtrl::SetDefaultStyle(const wxTextAttr& style)
{
- return GetBuffer().SetDefaultStyle(wxTextAttr(style));
+ return GetBuffer().SetDefaultStyle(style);
+}
+
+bool wxRichTextCtrl::SetDefaultStyle(const wxRichTextAttr& style)
+{
+ wxRichTextAttr attr1(style);
+ attr1.GetTextBoxAttr().Reset();
+ return GetBuffer().SetDefaultStyle(attr1);
}
-const wxTextAttr& wxRichTextCtrl::GetDefaultStyle() const
+const wxRichTextAttr& wxRichTextCtrl::GetDefaultStyleEx() const
{
return GetBuffer().GetDefaultStyle();
}
bool wxRichTextCtrl::GetStyle(long position, wxTextAttr& style)
{
- return GetBuffer().GetStyle(position, style);
+ wxRichTextAttr attr;
+ if (GetFocusObject()->GetStyle(position, attr))
+ {
+ style = attr;
+ return true;
+ }
+ else
+ return false;
+}
+
+bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style)
+{
+ return GetFocusObject()->GetStyle(position, style);
+}
+
+bool wxRichTextCtrl::GetStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container)
+{
+ wxRichTextAttr attr;
+ if (container->GetStyle(position, attr))
+ {
+ style = attr;
+ return true;
+ }
+ else
+ return false;
}
// get the common set of styles for the range
bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style)
{
- return GetBuffer().GetStyleForRange(range.ToInternal(), style);
+ wxRichTextAttr attr;
+ if (GetFocusObject()->GetStyleForRange(range.ToInternal(), attr))
+ {
+ style = attr;
+ return true;
+ }
+ else
+ return false;
+}
+
+bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style)
+{
+ return GetFocusObject()->GetStyleForRange(range.ToInternal(), style);
+}
+
+bool wxRichTextCtrl::GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container)
+{
+ return container->GetStyleForRange(range.ToInternal(), style);
+}
+
+/// Get the content (uncombined) attributes for this position.
+bool wxRichTextCtrl::GetUncombinedStyle(long position, wxRichTextAttr& style)
+{
+ return GetFocusObject()->GetUncombinedStyle(position, style);
}
/// Get the content (uncombined) attributes for this position.
-bool wxRichTextCtrl::GetUncombinedStyle(long position, wxTextAttr& style)
+bool wxRichTextCtrl::GetUncombinedStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container)
{
- return GetBuffer().GetUncombinedStyle(position, style);
+ return container->GetUncombinedStyle(position, style);
}
/// Set font, and also the buffer attributes
{
wxControl::SetFont(font);
- wxTextAttr attr = GetBuffer().GetAttributes();
+ wxRichTextAttr attr = GetBuffer().GetAttributes();
attr.SetFont(font);
GetBuffer().SetBasicStyle(attr);
}
/// Position the caret
-void wxRichTextCtrl::PositionCaret()
+void wxRichTextCtrl::PositionCaret(wxRichTextParagraphLayoutBox* container)
{
if (!GetCaret())
return;
//wxLogDebug(wxT("PositionCaret"));
wxRect caretRect;
- if (GetCaretPositionForIndex(GetCaretPosition(), caretRect))
+ if (GetCaretPositionForIndex(GetCaretPosition(), caretRect, container))
{
wxPoint newPt = caretRect.GetPosition();
wxSize newSz = caretRect.GetSize();
GetCaret()->Hide();
if (GetCaret()->GetSize() != newSz)
GetCaret()->SetSize(newSz);
+
+ int halfSize = newSz.y/2;
+ // If the caret is beyond the margin, hide it by moving it out of the way
+ if (((pt.y + halfSize) < GetBuffer().GetTopMargin()) || ((pt.y + halfSize) > (GetClientSize().y - GetBuffer().GetBottomMargin())))
+ {
+ pt.x = -200;
+ pt.y = -200;
+ }
+
GetCaret()->Move(pt);
GetCaret()->Show();
}
}
/// Get the caret height and position for the given character position
-bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect)
+bool wxRichTextCtrl::GetCaretPositionForIndex(long position, wxRect& rect, wxRichTextParagraphLayoutBox* container)
{
wxClientDC dc(this);
dc.SetFont(GetFont());
wxPoint pt;
int height = 0;
- if (GetBuffer().FindPosition(dc, position, pt, & height, m_caretAtLineStart))
+ if (!container)
+ container = GetFocusObject();
+
+ if (container->FindPosition(dc, position, pt, & height, m_caretAtLineStart))
{
// Caret height can't be zero
if (height == 0)
/// if this is the case.
wxRichTextLine* wxRichTextCtrl::GetVisibleLineForCaretPosition(long caretPosition) const
{
- wxRichTextLine* line = GetBuffer().GetLineAtPosition(caretPosition, true);
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(caretPosition, true);
+ wxRichTextLine* line = GetFocusObject()->GetLineAtPosition(caretPosition, true);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(caretPosition, true);
if (line)
{
wxRichTextRange lineRange = line->GetAbsoluteRange();
(para->GetRange().GetStart() != lineRange.GetStart()))
{
if (!m_caretAtLineStart)
- line = GetBuffer().GetLineAtPosition(caretPosition-1, true);
+ line = GetFocusObject()->GetLineAtPosition(caretPosition-1, true);
}
}
return line;
/// Move the caret to the given character position
-bool wxRichTextCtrl::MoveCaret(long pos, bool showAtLineStart)
+bool wxRichTextCtrl::MoveCaret(long pos, bool showAtLineStart, wxRichTextParagraphLayoutBox* container)
{
- if (GetBuffer().GetDirty())
+ if (GetBuffer().IsDirty())
LayoutContent();
- if (pos <= GetBuffer().GetRange().GetEnd())
+ if (!container)
+ container = GetFocusObject();
+
+ if (pos <= container->GetOwnRange().GetEnd())
{
SetCaretPosition(pos, showAtLineStart);
- PositionCaret();
+ PositionCaret(container);
return true;
}
/// setting the caret position.
bool wxRichTextCtrl::LayoutContent(bool onlyVisibleRect)
{
- if (GetBuffer().GetDirty() || onlyVisibleRect)
+ if (GetBuffer().IsDirty() || onlyVisibleRect)
{
wxRect availableSpace(GetClientSize());
if (availableSpace.width == 0)
GetBuffer().Defragment();
GetBuffer().UpdateRanges(); // If items were deleted, ranges need recalculation
GetBuffer().Layout(dc, availableSpace, flags);
- GetBuffer().SetDirty(false);
+ GetBuffer().Invalidate(wxRICHTEXT_NONE);
if (!IsFrozen())
SetupScrollbars();
{
if (HasSelection())
{
- wxTextAttr attr;
+ wxRichTextAttr attr;
wxRichTextRange range = GetSelectionRange();
attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
- attr.SetFontWeight(wxBOLD);
+ attr.SetFontWeight(wxFONTWEIGHT_BOLD);
return HasCharacterAttributes(range, attr);
}
{
// If no selection, then we need to combine current style with default style
// to see what the effect would be if we started typing.
- wxTextAttr attr;
+ wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
long pos = GetAdjustedCaretPosition(GetCaretPosition());
{
if (IsDefaultStyleShowing())
wxRichTextApplyStyle(attr, GetDefaultStyleEx());
- return attr.GetFontWeight() == wxBOLD;
+ return attr.GetFontWeight() == wxFONTWEIGHT_BOLD;
}
}
return false;
if (HasSelection())
{
wxRichTextRange range = GetSelectionRange();
- wxTextAttr attr;
+ wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
- attr.SetFontStyle(wxITALIC);
+ attr.SetFontStyle(wxFONTSTYLE_ITALIC);
return HasCharacterAttributes(range, attr);
}
{
// If no selection, then we need to combine current style with default style
// to see what the effect would be if we started typing.
- wxTextAttr attr;
+ wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
long pos = GetAdjustedCaretPosition(GetCaretPosition());
{
if (IsDefaultStyleShowing())
wxRichTextApplyStyle(attr, GetDefaultStyleEx());
- return attr.GetFontStyle() == wxITALIC;
+ return attr.GetFontStyle() == wxFONTSTYLE_ITALIC;
}
}
return false;
if (HasSelection())
{
wxRichTextRange range = GetSelectionRange();
- wxTextAttr attr;
+ wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
attr.SetFontUnderlined(true);
{
// If no selection, then we need to combine current style with default style
// to see what the effect would be if we started typing.
- wxTextAttr attr;
+ wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
long pos = GetAdjustedCaretPosition(GetCaretPosition());
/// Apply bold to the selection
bool wxRichTextCtrl::ApplyBoldToSelection()
{
- wxTextAttr attr;
+ wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_WEIGHT);
- attr.SetFontWeight(IsSelectionBold() ? wxNORMAL : wxBOLD);
+ attr.SetFontWeight(IsSelectionBold() ? wxFONTWEIGHT_NORMAL : wxFONTWEIGHT_BOLD);
if (HasSelection())
return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);
/// Apply italic to the selection
bool wxRichTextCtrl::ApplyItalicToSelection()
{
- wxTextAttr attr;
+ wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_ITALIC);
- attr.SetFontStyle(IsSelectionItalics() ? wxNORMAL : wxITALIC);
+ attr.SetFontStyle(IsSelectionItalics() ? wxFONTSTYLE_NORMAL : wxFONTSTYLE_ITALIC);
if (HasSelection())
return SetStyleEx(GetSelectionRange(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY);
/// Apply underline to the selection
bool wxRichTextCtrl::ApplyUnderlineToSelection()
{
- wxTextAttr attr;
+ wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_FONT_UNDERLINE);
attr.SetFontUnderlined(!IsSelectionUnderlined());
else
range = wxRichTextRange(GetCaretPosition()+1, GetCaretPosition()+2);
- wxTextAttr attr;
+ wxRichTextAttr attr;
attr.SetAlignment(alignment);
return HasParagraphAttributes(range, attr);
/// Apply alignment to the selection
bool wxRichTextCtrl::ApplyAlignmentToSelection(wxTextAttrAlignment alignment)
{
- wxTextAttr attr;
+ wxRichTextAttr attr;
attr.SetAlignment(alignment);
if (HasSelection())
return SetStyle(GetSelectionRange(), attr);
else
{
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(GetCaretPosition()+1);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(GetCaretPosition()+1);
if (para)
return SetStyleEx(para->GetRange().FromInternal(), attr, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY);
}
{
// Flags are defined within each definition, so only certain
// attributes are applied.
- wxTextAttr attr(GetStyleSheet() ? def->GetStyleMergedWithBase(GetStyleSheet()) : def->GetStyle());
+ wxRichTextAttr attr(GetStyleSheet() ? def->GetStyleMergedWithBase(GetStyleSheet()) : def->GetStyle());
int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE|wxRICHTEXT_SETSTYLE_RESET;
return SetListStyle(range, (wxRichTextListStyleDefinition*) def, flags);
}
+ bool isPara = false;
+
// Make sure the attr has the style name
if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition)))
{
+ isPara = true;
attr.SetParagraphStyleName(def->GetName());
// If applying a paragraph style, we only want the paragraph nodes to adopt these
else
{
wxRichTextAttr current = GetDefaultStyleEx();
- current.Apply(attr);
+ wxRichTextAttr defaultStyle(attr);
+ if (isPara)
+ {
+ // Don't apply extra character styles since they are already implied
+ // in the paragraph style
+ defaultStyle.SetFlags(defaultStyle.GetFlags() & ~wxTEXT_ATTR_CHARACTER);
+ }
+ current.Apply(defaultStyle);
SetAndShowDefaultStyle(current);
+
+ // If it's a paragraph style, we want to apply the style to the
+ // current paragraph even if we didn't select any text.
+ if (isPara)
+ {
+ long pos = GetAdjustedCaretPosition(GetCaretPosition());
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(pos);
+ if (para)
+ {
+ return SetStyleEx(para->GetRange().FromInternal(), attr, flags);
+ }
+ }
return true;
}
}
/// Sets the default style to the style under the cursor
bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
{
- wxTextAttr attr;
+ wxRichTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_CHARACTER);
// If at the start of a paragraph, use the next position.
/// Returns the first visible position in the current view
long wxRichTextCtrl::GetFirstVisiblePosition() const
{
- wxRichTextLine* line = GetBuffer().GetLineAtYPosition(GetLogicalPoint(wxPoint(0, 0)).y);
+ wxRichTextLine* line = GetFocusObject()->GetLineAtYPosition(GetLogicalPoint(wxPoint(0, 0)).y);
if (line)
return line->GetAbsoluteRange().GetStart();
else
/// style information should be taken from the next position, not current one.
long wxRichTextCtrl::GetAdjustedCaretPosition(long caretPos) const
{
- wxRichTextParagraph* para = GetBuffer().GetParagraphAtPosition(caretPos+1);
+ wxRichTextParagraph* para = GetFocusObject()->GetParagraphAtPosition(caretPos+1);
if (para && (caretPos+1 == para->GetRange().GetStart()))
caretPos ++;
void wxRichTextCtrl::SetSelectionRange(const wxRichTextRange& range)
{
- wxRichTextRange range1(range);
- if (range1 != wxRichTextRange(-2,-2) && range1 != wxRichTextRange(-1,-1) )
- range1.SetEnd(range1.GetEnd() - 1);
-
- wxASSERT( range1.GetStart() > range1.GetEnd() );
-
- SetInternalSelectionRange(range1);
+ SetSelection(range.GetStart(), range.GetEnd());
}
/// Set list style
bool wxRichTextCtrl::SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
{
- return GetBuffer().SetListStyle(range.ToInternal(), def, flags, startFrom, specifiedLevel);
+ return GetFocusObject()->SetListStyle(range.ToInternal(), def, flags, startFrom, specifiedLevel);
}
bool wxRichTextCtrl::SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
{
- return GetBuffer().SetListStyle(range.ToInternal(), defName, flags, startFrom, specifiedLevel);
+ return GetFocusObject()->SetListStyle(range.ToInternal(), defName, flags, startFrom, specifiedLevel);
}
/// Clear list for given range
bool wxRichTextCtrl::ClearListStyle(const wxRichTextRange& range, int flags)
{
- return GetBuffer().ClearListStyle(range.ToInternal(), flags);
+ return GetFocusObject()->ClearListStyle(range.ToInternal(), flags);
}
/// Number/renumber any list elements in the given range
bool wxRichTextCtrl::NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int startFrom, int specifiedLevel)
{
- return GetBuffer().NumberList(range.ToInternal(), def, flags, startFrom, specifiedLevel);
+ return GetFocusObject()->NumberList(range.ToInternal(), def, flags, startFrom, specifiedLevel);
}
bool wxRichTextCtrl::NumberList(const wxRichTextRange& range, const wxString& defName, int flags, int startFrom, int specifiedLevel)
{
- return GetBuffer().NumberList(range.ToInternal(), defName, flags, startFrom, specifiedLevel);
+ return GetFocusObject()->NumberList(range.ToInternal(), defName, flags, startFrom, specifiedLevel);
}
/// Promote the list items within the given range. promoteBy can be a positive or negative number, e.g. 1 or -1
bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags, int specifiedLevel)
{
- return GetBuffer().PromoteList(promoteBy, range.ToInternal(), def, flags, specifiedLevel);
+ return GetFocusObject()->PromoteList(promoteBy, range.ToInternal(), def, flags, specifiedLevel);
}
bool wxRichTextCtrl::PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags, int specifiedLevel)
{
- return GetBuffer().PromoteList(promoteBy, range.ToInternal(), defName, flags, specifiedLevel);
+ return GetFocusObject()->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);
+ return GetFocusObject()->DeleteRangeWithUndo(range.ToInternal(), this, & GetBuffer());
}
const wxArrayString& wxRichTextCtrl::GetAvailableFontNames()
}
// Refresh the area affected by a selection change
-bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextRange& oldSelection, const wxRichTextRange& newSelection)
-{
+bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextSelection& oldSelection, const wxRichTextSelection& newSelection)
+{
+ // If the selection is not part of the focus object, or we have multiple ranges, then the chances are that
+ // the selection contains whole containers rather than just text, so refresh everything
+ // for now as it would be hard to compute the rectangle bounding all selections.
+ // TODO: improve on this.
+ if ((oldSelection.IsValid() && (oldSelection.GetContainer() != GetFocusObject() || oldSelection.GetCount() > 1)) ||
+ (newSelection.IsValid() && (newSelection.GetContainer() != GetFocusObject() || newSelection.GetCount() > 1)))
+ {
+ Refresh(false);
+ return true;
+ }
+
+ wxRichTextRange oldRange, newRange;
+ if (oldSelection.IsValid())
+ oldRange = oldSelection.GetRange();
+ else
+ oldRange = wxRICHTEXT_NO_SELECTION;
+ if (newSelection.IsValid())
+ newRange = newSelection.GetRange();
+ else
+ newRange = wxRICHTEXT_NO_SELECTION;
+
// Calculate the refresh rectangle - just the affected lines
long firstPos, lastPos;
- if (oldSelection.GetStart() == -2 && newSelection.GetStart() != -2)
+ if (oldRange.GetStart() == -2 && newRange.GetStart() != -2)
{
- firstPos = newSelection.GetStart();
- lastPos = newSelection.GetEnd();
+ firstPos = newRange.GetStart();
+ lastPos = newRange.GetEnd();
}
- else if (oldSelection.GetStart() != -2 && newSelection.GetStart() == -2)
+ else if (oldRange.GetStart() != -2 && newRange.GetStart() == -2)
{
- firstPos = oldSelection.GetStart();
- lastPos = oldSelection.GetEnd();
+ firstPos = oldRange.GetStart();
+ lastPos = oldRange.GetEnd();
}
- else if (oldSelection.GetStart() == -2 && newSelection.GetStart() == -2)
+ else if (oldRange.GetStart() == -2 && newRange.GetStart() == -2)
{
return false;
}
else
{
- firstPos = wxMin(oldSelection.GetStart(), newSelection.GetStart());
- lastPos = wxMax(oldSelection.GetEnd(), newSelection.GetEnd());
+ firstPos = wxMin(oldRange.GetStart(), newRange.GetStart());
+ lastPos = wxMax(oldRange.GetEnd(), newRange.GetEnd());
}
- wxRichTextLine* firstLine = GetBuffer().GetLineAtPosition(firstPos);
- wxRichTextLine* lastLine = GetBuffer().GetLineAtPosition(lastPos);
+ wxRichTextLine* firstLine = GetFocusObject()->GetLineAtPosition(firstPos);
+ wxRichTextLine* lastLine = GetFocusObject()->GetLineAtPosition(lastPos);
if (firstLine && lastLine)
{
return true;
}
+// margins functions
+bool wxRichTextCtrl::DoSetMargins(const wxPoint& pt)
+{
+ GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetLeft().SetValue(pt.x, wxTEXT_ATTR_UNITS_PIXELS);
+ GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetRight().SetValue(pt.x, wxTEXT_ATTR_UNITS_PIXELS);
+ GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetTop().SetValue(pt.y, wxTEXT_ATTR_UNITS_PIXELS);
+ GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetBottom().SetValue(pt.y, wxTEXT_ATTR_UNITS_PIXELS);
+
+ return true;
+}
+
+wxPoint wxRichTextCtrl::DoGetMargins() const
+{
+ return wxPoint(GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetLeft().GetValue(),
+ GetBuffer().GetAttributes().GetTextBoxAttr().GetMargins().GetTop().GetValue());
+}
+
+bool wxRichTextCtrl::SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setCaretPosition)
+{
+ if (obj && !obj->AcceptsFocus())
+ return false;
+
+ wxRichTextParagraphLayoutBox* oldContainer = GetFocusObject();
+ bool changingContainer = (m_focusObject != obj);
+
+ m_focusObject = obj;
+
+ if (!obj)
+ m_focusObject = & m_buffer;
+
+ if (setCaretPosition && changingContainer)
+ {
+ m_selection.Reset();
+ m_selectionAnchor = -2;
+ m_selectionAnchorObject = NULL;
+ m_selectionState = wxRichTextCtrlSelectionState_Normal;
+
+ long pos = -1;
+
+ m_caretAtLineStart = false;
+ MoveCaret(pos, m_caretAtLineStart);
+ SetDefaultStyleToCursorStyle();
+
+ wxRichTextEvent cmdEvent(
+ wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED,
+ GetId());
+ cmdEvent.SetEventObject(this);
+ cmdEvent.SetPosition(m_caretPosition+1);
+ cmdEvent.SetOldContainer(oldContainer);
+ cmdEvent.SetContainer(m_focusObject);
+
+ GetEventHandler()->ProcessEvent(cmdEvent);
+ }
+ return true;
+}
+
#if wxRICHTEXT_USE_OWN_CARET
// ----------------------------------------------------------------------------
m_yOld = -1;
m_richTextCtrl = NULL;
m_needsUpdate = false;
+ m_flashOn = true;
}
wxRichTextCaret::~wxRichTextCaret()
{
+ if (m_timer.IsRunning())
+ m_timer.Stop();
}
// ----------------------------------------------------------------------------
void wxRichTextCaret::DoShow()
{
+ m_flashOn = true;
+
+ if (!m_timer.IsRunning())
+ m_timer.Start(GetBlinkTime());
+
Refresh();
}
void wxRichTextCaret::DoHide()
{
+ if (m_timer.IsRunning())
+ m_timer.Stop();
+
Refresh();
}
dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH));
dc->SetPen(*wxBLACK_PEN);
- // VZ: unfortunately, the rectangle comes out a pixel smaller when this is
- // done under wxGTK - no idea why
- //dc->SetLogicalFunction(wxINVERT);
-
wxPoint pt(m_x, m_y);
if (m_richTextCtrl)
{
pt = m_richTextCtrl->GetLogicalPoint(pt);
}
- dc->DrawRectangle(pt.x, pt.y, m_width, m_height);
+ if (IsVisible() && m_flashOn)
+ dc->DrawRectangle(pt.x, pt.y, m_width, m_height);
+}
+
+void wxRichTextCaret::Notify()
+{
+ m_flashOn = !m_flashOn;
+ Refresh();
+}
+
+void wxRichTextCaretTimer::Notify()
+{
+ m_caret->Notify();
}
#endif
// wxRICHTEXT_USE_OWN_CARET
+// Add an item
+bool wxRichTextContextMenuPropertiesInfo::AddItem(const wxString& label, wxRichTextObject* obj)
+{
+ if (GetCount() < 3)
+ {
+ m_labels.Add(label);
+ m_objects.Add(obj);
+ return true;
+ }
+ else
+ return false;
+}
+
+// Returns number of menu items were added.
+int wxRichTextContextMenuPropertiesInfo::AddMenuItems(wxMenu* menu, int startCmd) const
+{
+ wxMenuItem* item = menu->FindItem(startCmd);
+ // If none of the standard properties identifiers are in the menu, assume it's
+ // a custom menu without properties commands, and don't add them.
+ if (item)
+ {
+ // If no items, to add just set the text to something generic
+ if (GetCount() == 0)
+ {
+ menu->SetLabel(startCmd, _("&Properties"));
+
+ // Delete the others if necessary
+ int i;
+ for (i = startCmd+1; i < startCmd+3; i++)
+ {
+ if (menu->FindItem(i))
+ {
+ menu->Delete(i);
+ }
+ }
+ }
+ else
+ {
+ int i;
+ int pos = -1;
+ // Find the position of the first properties item
+ for (i = 0; i < (int) menu->GetMenuItemCount(); i++)
+ {
+ wxMenuItem* item = menu->FindItemByPosition(i);
+ if (item && item->GetId() == startCmd)
+ {
+ pos = i;
+ break;
+ }
+ }
+
+ if (pos != -1)
+ {
+ int insertBefore = pos+1;
+ for (i = startCmd; i < startCmd+GetCount(); i++)
+ {
+ if (menu->FindItem(i))
+ {
+ menu->SetLabel(i, m_labels[i - startCmd]);
+ }
+ else
+ {
+ if (insertBefore >= (int) menu->GetMenuItemCount())
+ menu->Append(i, m_labels[i - startCmd]);
+ else
+ menu->Insert(insertBefore, i, m_labels[i - startCmd]);
+ }
+ insertBefore ++;
+ }
+
+ // Delete any old items still left on the menu
+ for (i = startCmd + GetCount(); i < startCmd+3; i++)
+ {
+ if (menu->FindItem(i))
+ {
+ menu->Delete(i);
+ }
+ }
+ }
+ }
+ }
+
+ return GetCount();
+}
+
+// Add appropriate menu items for the current container and clicked on object
+// (and container's parent, if appropriate).
+int wxRichTextContextMenuPropertiesInfo::AddItems(wxRichTextObject* container, wxRichTextObject* obj)
+{
+ Clear();
+ if (obj && obj->CanEditProperties())
+ AddItem(obj->GetPropertiesMenuLabel(), obj);
+
+ if (container && container != obj && container->CanEditProperties() && m_labels.Index(container->GetPropertiesMenuLabel()) == wxNOT_FOUND)
+ AddItem(container->GetPropertiesMenuLabel(), container);
+
+ if (container && container->GetParent() && container->GetParent()->CanEditProperties() && m_labels.Index(container->GetParent()->GetPropertiesMenuLabel()) == wxNOT_FOUND)
+ AddItem(container->GetParent()->GetPropertiesMenuLabel(), container->GetParent());
+
+ return GetCount();
+}
+
#endif
// wxUSE_RICHTEXT
projects / wxWidgets.git / blobdiff