X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dadd4f5523e6ab9b489632f478958cd6dc8d03aa..53a64063c80a713baefedb95d06ec850fe853448:/src/richtext/richtextctrl.cpp diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index ad63479c42..bf308ffb7a 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -44,6 +44,10 @@ 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_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) IMPLEMENT_CLASS( wxRichTextCtrl, wxControl ) @@ -124,6 +128,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } + GetBuffer().Reset(); GetBuffer().SetRichTextCtrl(this); if (style & wxTE_READONLY) @@ -137,7 +142,7 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va attributes.SetLineSpacing(10); attributes.SetParagraphSpacingAfter(10); attributes.SetParagraphSpacingBefore(0); - attributes.SetFlags(wxTEXT_ATTR_ALL); + SetBasicStyle(attributes); // The default attributes will be merged with base attributes, so @@ -156,16 +161,23 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va RecreateBuffer(size); #endif - SetCursor(wxCursor(wxCURSOR_IBEAM)); + m_textCursor = wxCursor(wxCURSOR_IBEAM); + m_urlCursor = wxCursor(wxCURSOR_HAND); + + SetCursor(m_textCursor); if (!value.IsEmpty()) SetValue(value); + GetBuffer().AddEventHandler(this); + return true; } wxRichTextCtrl::~wxRichTextCtrl() { + GetBuffer().RemoveEventHandler(this); + delete m_contextMenu; } @@ -209,7 +221,7 @@ void wxRichTextCtrl::Thaw() /// Clear all text void wxRichTextCtrl::Clear() { - m_buffer.Reset(); + m_buffer.ResetAndClearCommands(); m_buffer.SetDirty(true); m_caretPosition = -1; m_caretPositionForDefaultStyle = -2; @@ -333,25 +345,59 @@ void wxRichTextCtrl::OnLeftClick(wxMouseEvent& event) } /// Left-up -void wxRichTextCtrl::OnLeftUp(wxMouseEvent& WXUNUSED(event)) +void wxRichTextCtrl::OnLeftUp(wxMouseEvent& event) { if (m_dragging) { m_dragging = false; if (GetCapture() == this) ReleaseMouse(); + + // See if we clicked on a URL + wxClientDC dc(this); + PrepareDC(dc); + dc.SetFont(GetFont()); + + long position = 0; + wxPoint logicalPt = event.GetLogicalPosition(dc); + int hit = GetBuffer().HitTest(dc, logicalPt, position); + + if (hit != wxRICHTEXT_HITTEST_NONE) + { + wxTextAttrEx attr; + if (GetStyle(position, attr)) + { + if (attr.HasFlag(wxTEXT_ATTR_URL)) + { + wxString urlTarget = attr.GetURL(); + if (!urlTarget.IsEmpty()) + { + wxMouseEvent mouseEvent(event); + + long startPos = 0, endPos = 0; + wxRichTextObject* obj = GetBuffer().GetLeafObjectAtPosition(position); + if (obj) + { + startPos = obj->GetRange().GetStart(); + endPos = obj->GetRange().GetEnd(); + } + + wxTextUrlEvent urlEvent(GetId(), mouseEvent, startPos, endPos); + InitCommandEvent(urlEvent); + + urlEvent.SetString(urlTarget); + + GetEventHandler()->ProcessEvent(urlEvent); + } + } + } + } } } /// Left-click void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) { - if (!event.Dragging()) - { - event.Skip(); - return; - } - wxClientDC dc(this); PrepareDC(dc); dc.SetFont(GetFont()); @@ -359,6 +405,34 @@ void wxRichTextCtrl::OnMoveMouse(wxMouseEvent& event) long position = 0; wxPoint logicalPt = event.GetLogicalPosition(dc); int hit = GetBuffer().HitTest(dc, logicalPt, position); + + // See if we need to change the cursor + + { + if (hit != wxRICHTEXT_HITTEST_NONE) + { + wxTextAttrEx attr; + if (GetStyle(position, attr)) + { + if (attr.HasFlag(wxTEXT_ATTR_URL)) + { + if (GetCursor() != m_urlCursor) + SetCursor(m_urlCursor); + } + else if (!attr.HasFlag(wxTEXT_ATTR_URL)) + { + if (GetCursor() != m_textCursor) + SetCursor(m_textCursor); + } + } + } + } + + if (!event.Dragging()) + { + event.Skip(); + return; + } if (m_dragging && hit != wxRICHTEXT_HITTEST_NONE) { @@ -462,18 +536,24 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) DeleteSelectedContent(& newPos); GetBuffer().InsertNewlineWithUndo(newPos+1, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE); + EndBatchUndo(); + SetDefaultStyleToCursorStyle(); + + ScrollIntoView(m_caretPosition, WXK_RIGHT); wxRichTextEvent cmdEvent( wxEVT_COMMAND_RICHTEXT_RETURN, GetId()); cmdEvent.SetEventObject(this); cmdEvent.SetFlags(flags); - GetEventHandler()->ProcessEvent(cmdEvent); - - EndBatchUndo(); - SetDefaultStyleToCursorStyle(); - - ScrollIntoView(m_caretPosition, WXK_RIGHT); + if (!GetEventHandler()->ProcessEvent(cmdEvent)) + { + // Generate conventional event + wxCommandEvent textEvent(wxEVT_COMMAND_TEXT_ENTER, GetId()); + InitCommandEvent(textEvent); + + GetEventHandler()->ProcessEvent(textEvent); + } } else if (event.GetKeyCode() == WXK_BACK) { @@ -493,7 +573,6 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) EndBatchUndo(); - // Shouldn't this be in Do()? if (GetLastPosition() == -1) { GetBuffer().Reset(); @@ -522,7 +601,6 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) EndBatchUndo(); - // Shouldn't this be in Do()? if (GetLastPosition() == -1) { GetBuffer().Reset(); @@ -644,7 +722,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) event.Skip(); return; } - + if (keycode == wxT('\t')) { // See if we need to promote or demote the selection or paragraph at the cursor @@ -658,10 +736,11 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) range = GetSelectionRange(); else range = para->GetRange().FromInternal(); - + int promoteBy = event.ShiftDown() ? 1 : -1; PromoteList(promoteBy, range, NULL); + return; } } @@ -2776,20 +2855,20 @@ bool wxRichTextCtrl::ApplyStyle(wxRichTextStyleDefinition* def) if (def->IsKindOf(CLASSINFO(wxRichTextListStyleDefinition))) { flags |= wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY; - + wxRichTextRange range; - + if (HasSelection()) range = GetSelectionRange(); else { - long pos = GetAdjustedCaretPosition(GetCaretPosition()); + long pos = GetAdjustedCaretPosition(GetCaretPosition()); range = wxRichTextRange(pos, pos+1); } - - return SetListStyle(range, (wxRichTextListStyleDefinition*) def, flags); - } - + + return SetListStyle(range, (wxRichTextListStyleDefinition*) def, flags); + } + // Make sure the attr has the style name if (def->IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition))) { @@ -2916,12 +2995,12 @@ bool wxRichTextCtrl::ClearListStyle(const wxRichTextRange& range, int 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 GetBuffer().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 GetBuffer().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 @@ -2952,4 +3031,3 @@ void wxRichTextCtrl::ClearAvailableFontNames() #endif // wxUSE_RICHTEXT -