X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38113684016c5ecbc65985bee3c6c7b318c012cf..8ad31f9dfdb85a54cd080aac6957883f2f3e38e3:/src/richtext/richtextbuffer.cpp diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index aa12d8a7b4..3f714632a4 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -16,29 +16,29 @@ #pragma hdrstop #endif +#if wxUSE_RICHTEXT + +#include "wx/richtext/richtextbuffer.h" + #ifndef WX_PRECOMP #include "wx/wx.h" #endif -#include "wx/image.h" - -#if wxUSE_RICHTEXT - #include "wx/filename.h" #include "wx/clipbrd.h" +#include "wx/dataobj.h" #include "wx/wfstream.h" #include "wx/module.h" #include "wx/mstream.h" #include "wx/sstream.h" -#include "wx/richtext/richtextbuffer.h" #include "wx/richtext/richtextctrl.h" #include "wx/richtext/richtextstyles.h" #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxRichTextObjectList); -WX_DEFINE_LIST(wxRichTextLineList); +WX_DEFINE_LIST(wxRichTextObjectList) +WX_DEFINE_LIST(wxRichTextLineList) /*! * wxRichTextObject @@ -174,9 +174,10 @@ bool wxRichTextCompositeObject::RemoveChild(wxRichTextObject* child, bool delete wxRichTextObjectList::compatibility_iterator node = m_children.Find(child); if (node) { + wxRichTextObject* obj = node->GetData(); + m_children.Erase(node); if (deleteChild) - delete node->GetData(); - delete node; + delete obj; return true; } @@ -195,7 +196,7 @@ bool wxRichTextCompositeObject::DeleteChildren() child->Dereference(); // Only delete if reference count is zero node = node->GetNext(); - delete oldNode; + m_children.Erase(oldNode); } return true; @@ -368,7 +369,7 @@ bool wxRichTextCompositeObject::Defragment() if (child->CanMerge(nextChild) && child->Merge(nextChild)) { nextChild->Dereference(); - delete node->GetNext(); + m_children.Erase(node->GetNext()); // Don't set node -- we'll see if we can merge again with the next // child. @@ -516,7 +517,31 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range, /// Lay the item out bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int style) { - wxRect availableSpace(rect.x + m_leftMargin, + wxRect availableSpace; + bool formatRect = (style & wxRICHTEXT_LAYOUT_SPECIFIED_RECT) == wxRICHTEXT_LAYOUT_SPECIFIED_RECT; + + // If only laying out a specific area, the passed rect has a different meaning: + // the visible part of the buffer. + if (formatRect) + { + availableSpace = wxRect(0 + m_leftMargin, + 0 + m_topMargin, + rect.width - m_leftMargin - m_rightMargin, + rect.height); + + // Invalidate the part of the buffer from the first visible line + // to the end. If other parts of the buffer are currently invalid, + // then they too will be taken into account if they are above + // the visible point. + long startPos = 0; + wxRichTextLine* line = GetLineAtYPosition(rect.y); + if (line) + startPos = line->GetAbsoluteRange().GetStart(); + + Invalidate(wxRichTextRange(startPos, GetRange().GetEnd())); + } + else + availableSpace = wxRect(rect.x + m_leftMargin, rect.y + m_topMargin, rect.width - m_leftMargin - m_rightMargin, rect.height - m_topMargin - m_bottomMargin); @@ -524,14 +549,17 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl int maxWidth = 0; wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); - + bool layoutAll = true; - + // Get invalid range, rounding to paragraph start/end. wxRichTextRange invalidRange = GetInvalidRange(true); - if (invalidRange == wxRichTextRange(-1, -1)) - layoutAll = true; + if (invalidRange == wxRICHTEXT_NONE && !formatRect) + return true; + + if (invalidRange == wxRICHTEXT_ALL) + layoutAll = true; else // If we know what range is affected, start laying out from that point on. if (invalidRange.GetStart() > GetRange().GetStart()) { @@ -539,7 +567,9 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl if (firstParagraph) { wxRichTextObjectList::compatibility_iterator firstNode = m_children.Find(firstParagraph); - wxRichTextObjectList::compatibility_iterator previousNode = firstNode ? node->GetPrevious() : (wxRichTextObjectList::compatibility_iterator) NULL; + wxRichTextObjectList::compatibility_iterator previousNode; + if ( firstNode ) + previousNode = firstNode->GetPrevious(); if (firstNode && previousNode) { wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph); @@ -547,24 +577,39 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl // Now we're going to start iterating from the first affected paragraph. node = firstNode; + + layoutAll = false; } } } + // A way to force speedy rest-of-buffer layout (the 'else' below) + bool forceQuickLayout = false; + while (node) { // Assume this box only contains paragraphs wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph); - wxASSERT (child != NULL); + wxCHECK_MSG( child, false, _T("Unknown object in layout") ); - if (child && (layoutAll || !child->GetRange().IsOutside(invalidRange))) + // TODO: what if the child hasn't been laid out (e.g. involved in Undo) but still has 'old' lines + if ( !forceQuickLayout && + (layoutAll || + child->GetLines().IsEmpty() || + !child->GetRange().IsOutside(invalidRange)) ) { child->Layout(dc, availableSpace, style); // Layout must set the cached size availableSpace.y += child->GetCachedSize().y; maxWidth = wxMax(maxWidth, child->GetCachedSize().x); + + // If we're just formatting the visible part of the buffer, + // and we're now past the bottom of the window, start quick + // layout. + if (formatRect && child->GetPosition().y > rect.GetBottom()) + forceQuickLayout = true; } else { @@ -600,7 +645,7 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl SetCachedSize(wxSize(maxWidth, availableSpace.y)); m_dirty = false; - m_invalidRange = wxRichTextRange(-1, -1); + m_invalidRange = wxRICHTEXT_NONE; return true; } @@ -616,8 +661,8 @@ bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wx { wxSize sz; - wxRichTextObjectList::compatibility_iterator startPara = NULL; - wxRichTextObjectList::compatibility_iterator endPara = NULL; + wxRichTextObjectList::compatibility_iterator startPara = wxRichTextObjectList::compatibility_iterator(); + wxRichTextObjectList::compatibility_iterator endPara = wxRichTextObjectList::compatibility_iterator(); // First find the first paragraph whose starting position is within the range. wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); @@ -729,11 +774,13 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtPosition(long pos, bool c { wxRichTextLine* line = node2->GetData(); - if (line->GetRange().Contains(pos) || + wxRichTextRange range = line->GetAbsoluteRange(); + + if (range.Contains(pos) || // If the position is end-of-paragraph, then return the last line of // of the paragraph. - (line->GetRange().GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())) + (range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())) return line; node2 = node2->GetNext(); @@ -803,7 +850,7 @@ int wxRichTextParagraphLayoutBox::GetLineCount() const /// Get the paragraph for a given line wxRichTextParagraph* wxRichTextParagraphLayoutBox::GetParagraphForLine(wxRichTextLine* line) const { - return GetParagraphAtPosition(line->GetRange().GetStart()); + return GetParagraphAtPosition(line->GetAbsoluteRange().GetStart()); } /// Get the line size at the given position @@ -1088,8 +1135,6 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextFragm return true; } - - return false; } /// Make a copy of the fragment corresponding to the given range, putting it in 'fragment'. @@ -1182,13 +1227,14 @@ long wxRichTextParagraphLayoutBox::GetVisibleLineNumber(long pos, bool caretPosi while (node2) { wxRichTextLine* line = node2->GetData(); + wxRichTextRange lineRange = line->GetAbsoluteRange(); - if (line->GetRange().Contains(pos)) + if (lineRange.Contains(pos)) { // If the caret is displayed at the end of the previous wrapped line, // we want to return the line it's _displayed_ at (not the actual line // containing the position). - if (line->GetRange().GetStart() == pos && !startOfLine && child->GetRange().GetStart() != pos) + if (lineRange.GetStart() == pos && !startOfLine && child->GetRange().GetStart() != pos) return lineCount - 1; else return lineCount; @@ -1308,7 +1354,7 @@ bool wxRichTextParagraphLayoutBox::DeleteRange(const wxRichTextRange& range) } wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext(); - delete node1; + nextParagraph->GetChildren().Erase(node1); node1 = next1; } @@ -1493,7 +1539,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const { // We'll be using a copy of the paragraph to make style changes, // not updating the buffer directly. - wxRichTextParagraph* newPara = NULL; + wxRichTextParagraph* newPara wxDUMMY_INITIALIZE(NULL); if (haveControl && withUndo) { @@ -1518,8 +1564,8 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const // we can start applying a different style. // TODO: check that the style actually changes or is different // from style outside of range - wxRichTextObject* firstObject = NULL; - wxRichTextObject* lastObject = NULL; + wxRichTextObject* firstObject wxDUMMY_INITIALIZE(NULL); + wxRichTextObject* lastObject wxDUMMY_INITIALIZE(NULL); if (childRange.GetStart() == newPara->GetRange().GetStart()) firstObject = newPara->GetChildren().GetFirst()->GetData(); @@ -1548,8 +1594,8 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxRichTextObjectList::compatibility_iterator firstNode = newPara->GetChildren().Find(firstObject); wxRichTextObjectList::compatibility_iterator lastNode = newPara->GetChildren().Find(lastObject); - wxASSERT(firstNode != NULL); - wxASSERT(lastNode != NULL); + wxASSERT(firstNode); + wxASSERT(lastNode); wxRichTextObjectList::compatibility_iterator node2 = firstNode; @@ -1587,11 +1633,13 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const /// Get the text attributes for this position. bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style) const { - wxRichTextObject* obj = NULL; + wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL); + if (style.IsParagraphStyle()) obj = GetParagraphAtPosition(position); else obj = GetLeafObjectAtPosition(position); + if (obj) { style = obj->GetAttributes(); @@ -1604,11 +1652,13 @@ bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style) /// Get the text attributes for this position. bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style) const { - wxRichTextObject* obj = NULL; + wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL); + if (style.IsParagraphStyle()) obj = GetParagraphAtPosition(position); else obj = GetLeafObjectAtPosition(position); + if (obj) { style = obj->GetAttributes(); @@ -1734,14 +1784,18 @@ void wxRichTextParagraphLayoutBox::Reset() void wxRichTextParagraphLayoutBox::Invalidate(const wxRichTextRange& invalidRange) { SetDirty(true); - - if (invalidRange == wxRichTextRange(-1, -1)) + + if (invalidRange == wxRICHTEXT_ALL) { - m_invalidRange = invalidRange; + m_invalidRange = wxRICHTEXT_ALL; return; } - - if (invalidRange.GetStart() < m_invalidRange.GetStart()) + + // Already invalidating everything + if (m_invalidRange == wxRICHTEXT_ALL) + return; + + if ((invalidRange.GetStart() < m_invalidRange.GetStart()) || m_invalidRange.GetStart() == -1) m_invalidRange.SetStart(invalidRange.GetStart()); if (invalidRange.GetEnd() > m_invalidRange.GetEnd()) m_invalidRange.SetEnd(invalidRange.GetEnd()); @@ -1750,11 +1804,11 @@ void wxRichTextParagraphLayoutBox::Invalidate(const wxRichTextRange& invalidRang /// Get invalid range, rounding to entire paragraphs if argument is true. wxRichTextRange wxRichTextParagraphLayoutBox::GetInvalidRange(bool wholeParagraphs) const { - if (m_invalidRange == wxRichTextRange(-1, -1)) + if (m_invalidRange == wxRICHTEXT_ALL || m_invalidRange == wxRICHTEXT_NONE) return m_invalidRange; - + wxRichTextRange range = m_invalidRange; - + if (wholeParagraphs) { wxRichTextParagraph* para1 = GetParagraphAtPosition(range.GetStart()); @@ -1856,7 +1910,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL; wxPoint linePos; - int lineHeight = 0; + int lineHeight wxDUMMY_INITIALIZE(0); if (line) { lineHeight = line->GetSize().y; @@ -1886,6 +1940,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), while (node) { wxRichTextLine* line = node->GetData(); + wxRichTextRange lineRange = line->GetAbsoluteRange(); int maxDescent = line->GetDescent(); @@ -1899,11 +1954,11 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), while (node2) { wxRichTextObject* child = node2->GetData(); - if (!child->GetRange().IsOutside(line->GetRange())) + if (!child->GetRange().IsOutside(lineRange)) { // Draw this part of the line at the correct position wxRichTextRange objectRange(child->GetRange()); - objectRange.LimitTo(line->GetRange()); + objectRange.LimitTo(lineRange); wxSize objectSize; int descent = 0; @@ -1915,7 +1970,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), objectPosition.x += objectSize.x; } - else if (child->GetRange().GetStart() > line->GetRange().GetEnd()) + else if (child->GetRange().GetStart() > lineRange.GetEnd()) // Can break out of inner loop now since we've passed this line's range break; @@ -1931,7 +1986,7 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), /// Lay the item out bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { - ClearLines(); + // ClearLines(); // Increase the size of the paragraph due to spacing int spaceBeforePara = ConvertTenthsMMToPixels(dc, GetAttributes().GetParagraphSpacingBefore()); @@ -2049,14 +2104,14 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) maxDescent = wxMax(childDescent, maxDescent); // Add a new line - wxRichTextLine* line = new wxRichTextLine(this); - line->SetRange(actualRange); + wxRichTextLine* line = AllocateLine(lineCount); + + // Set relative range so we won't have to change line ranges when paragraphs are moved + line->SetRange(wxRichTextRange(actualRange.GetStart() - GetRange().GetStart(), actualRange.GetEnd() - GetRange().GetStart())); line->SetPosition(currentPosition); line->SetSize(wxSize(currentWidth, lineHeight)); line->SetDescent(maxDescent); - m_cachedLines.Append(line); - // Now move down a line. TODO: add margins, spacing currentPosition.y += lineHeight; currentPosition.y += lineSpacing; @@ -2101,9 +2156,13 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) { currentPosition.x = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines); - wxRichTextLine* line = new wxRichTextLine(this); + wxRichTextLine* line = AllocateLine(lineCount); + + wxRichTextRange actualRange(lastCompletedEndPos+1, GetRange().GetEnd()-1); + + // Set relative range so we won't have to change line ranges when paragraphs are moved + line->SetRange(wxRichTextRange(actualRange.GetStart() - GetRange().GetStart(), actualRange.GetEnd() - GetRange().GetStart())); - line->SetRange(lastCompletedEndPos+1, GetRange().GetEnd()-1); line->SetPosition(currentPosition); if (lineHeight == 0) @@ -2123,10 +2182,11 @@ bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style) currentPosition.y += lineHeight; currentPosition.y += lineSpacing; lineCount ++; - - m_cachedLines.Append(line); } + // Remove remaining unused line objects, if any + ClearUnusedLines(lineCount); + // Apply styles to wrapped lines ApplyParagraphStyle(rect); @@ -2171,7 +2231,7 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxRect& rect) bool wxRichTextParagraph::InsertText(long pos, const wxString& text) { wxRichTextObject* childToUse = NULL; - wxRichTextObjectList::compatibility_iterator nodeToUse = NULL; + wxRichTextObjectList::compatibility_iterator nodeToUse = wxRichTextObjectList::compatibility_iterator(); wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst(); while (node) @@ -2302,7 +2362,8 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz while (node) { wxRichTextLine* line = node->GetData(); - if (!line->GetRange().IsOutside(range)) + wxRichTextRange lineRange = line->GetAbsoluteRange(); + if (!lineRange.IsOutside(range)) { wxSize lineSize; @@ -2311,9 +2372,9 @@ bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& siz { wxRichTextObject* child = node2->GetData(); - if (!child->GetRange().IsOutside(line->GetRange())) + if (!child->GetRange().IsOutside(lineRange)) { - wxRichTextRange rangeToUse = line->GetRange(); + wxRichTextRange rangeToUse = lineRange; rangeToUse.LimitTo(child->GetRange()); wxSize childSize; @@ -2392,12 +2453,13 @@ bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* h while (node) { wxRichTextLine* line = node->GetData(); - if (index >= line->GetRange().GetStart() && index <= line->GetRange().GetEnd()) + wxRichTextRange lineRange = line->GetAbsoluteRange(); + if (index >= lineRange.GetStart() && index <= lineRange.GetEnd()) { // If this is the last point in the line, and we're forcing the // returned value to be the start of the next line, do the required // thing. - if (index == line->GetRange().GetEnd() && forceLineStart) + if (index == lineRange.GetEnd() && forceLineStart) { if (node->GetNext()) { @@ -2410,7 +2472,7 @@ bool wxRichTextParagraph::FindPosition(wxDC& dc, long index, wxPoint& pt, int* h pt.y = line->GetPosition().y + GetPosition().y; - wxRichTextRange r(line->GetRange().GetStart(), index); + wxRichTextRange r(lineRange.GetStart(), index); wxSize rangeSize; int descent = 0; @@ -2446,29 +2508,30 @@ int wxRichTextParagraph::HitTest(wxDC& dc, const wxPoint& pt, long& textPosition wxRichTextLine* line = node->GetData(); wxPoint linePos = paraPos + line->GetPosition(); wxSize lineSize = line->GetSize(); + wxRichTextRange lineRange = line->GetAbsoluteRange(); if (pt.y >= linePos.y && pt.y <= linePos.y + lineSize.y) { if (pt.x < linePos.x) { - textPosition = line->GetRange().GetStart(); + textPosition = lineRange.GetStart(); return wxRICHTEXT_HITTEST_BEFORE; } else if (pt.x >= (linePos.x + lineSize.x)) { - textPosition = line->GetRange().GetEnd(); + textPosition = lineRange.GetEnd(); return wxRICHTEXT_HITTEST_AFTER; } else { long i; int lastX = linePos.x; - for (i = line->GetRange().GetStart(); i <= line->GetRange().GetEnd(); i++) + for (i = lineRange.GetStart(); i <= lineRange.GetEnd(); i++) { wxSize childSize; int descent = 0; - wxRichTextRange rangeToUse(line->GetRange().GetStart(), i); + wxRichTextRange rangeToUse(lineRange.GetStart(), i); GetRangeSize(rangeToUse, childSize, descent, dc, wxRICHTEXT_UNFORMATTED); @@ -2514,7 +2577,12 @@ wxRichTextObject* wxRichTextParagraph::SplitAt(long pos, wxRichTextObject** prev if (pos == child->GetRange().GetStart()) { if (previousObject) - *previousObject = child; + { + if (node->GetPrevious()) + *previousObject = node->GetPrevious()->GetData(); + else + *previousObject = NULL; + } return child; } @@ -2574,7 +2642,7 @@ void wxRichTextParagraph::MoveToList(wxRichTextObject* obj, wxList& list) /// Add content back from list void wxRichTextParagraph::MoveFromList(wxList& list) { - for (wxNode* node = list.GetFirst(); node; node = node->GetNext()) + for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) { AppendChild((wxRichTextObject*) node->GetData()); } @@ -2763,6 +2831,40 @@ wxString wxRichTextParagraph::GetBulletText() return text; } +/// Allocate or reuse a line object +wxRichTextLine* wxRichTextParagraph::AllocateLine(int pos) +{ + if (pos < (int) m_cachedLines.GetCount()) + { + wxRichTextLine* line = m_cachedLines.Item(pos)->GetData(); + line->Init(this); + return line; + } + else + { + wxRichTextLine* line = new wxRichTextLine(this); + m_cachedLines.Append(line); + return line; + } +} + +/// Clear remaining unused line objects, if any +bool wxRichTextParagraph::ClearUnusedLines(int lineCount) +{ + int cachedLineCount = m_cachedLines.GetCount(); + if ((int) cachedLineCount > lineCount) + { + for (int i = 0; i < (int) (cachedLineCount - lineCount); i ++) + { + wxRichTextLineList::compatibility_iterator node = m_cachedLines.GetLast(); + wxRichTextLine* line = node->GetData(); + m_cachedLines.Erase(node); + delete line; + } + } + return true; +} + /*! * wxRichTextLine @@ -2773,15 +2875,16 @@ wxString wxRichTextParagraph::GetBulletText() wxRichTextLine::wxRichTextLine(wxRichTextParagraph* parent) { - Init(); - - m_parent = parent; + Init(parent); } /// Initialisation -void wxRichTextLine::Init() +void wxRichTextLine::Init(wxRichTextParagraph* parent) { - m_parent = NULL; + m_parent = parent; + m_range.SetRange(-1, -1); + m_pos = wxPoint(0, 0); + m_size = wxSize(0, 0); m_descent = 0; } @@ -2797,6 +2900,14 @@ wxPoint wxRichTextLine::GetAbsolutePosition() const return m_parent->GetPosition() + m_pos; } +/// Get the absolute range +wxRichTextRange wxRichTextLine::GetAbsoluteRange() const +{ + wxRichTextRange range(m_range.GetStart() + m_parent->GetRange().GetStart(), 0); + range.SetEnd(range.GetStart() + m_range.GetLength()-1); + return range; +} + /*! * wxRichTextPlainText * This object represents a single piece of text. @@ -3095,6 +3206,7 @@ void wxRichTextBuffer::Clear() DeleteChildren(); GetCommandProcessor()->ClearCommands(); Modify(false); + Invalidate(wxRICHTEXT_ALL); } void wxRichTextBuffer::Reset() @@ -3103,6 +3215,7 @@ void wxRichTextBuffer::Reset() AddParagraph(wxEmptyString); GetCommandProcessor()->ClearCommands(); Modify(false); + Invalidate(wxRICHTEXT_ALL); } /// Submit command to insert the given text @@ -3299,15 +3412,15 @@ bool wxRichTextBuffer::BeginStyle(const wxTextAttrEx& style) /// End the style bool wxRichTextBuffer::EndStyle() { - if (m_attributeStack.GetFirst() == NULL) + if (!m_attributeStack.GetFirst()) { wxLogDebug(_("Too many EndStyle calls!")); return false; } - wxNode* node = m_attributeStack.GetLast(); + wxList::compatibility_iterator node = m_attributeStack.GetLast(); wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData(); - delete node; + m_attributeStack.Erase(node); SetDefaultStyle(*attr); @@ -3326,7 +3439,7 @@ bool wxRichTextBuffer::EndAllStyles() /// Clear the style stack void wxRichTextBuffer::ClearStyleStack() { - for (wxNode* node = m_attributeStack.GetFirst(); node; node = node->GetNext()) + for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext()) delete (wxTextAttrEx*) node->GetData(); m_attributeStack.Clear(); } @@ -3614,8 +3727,11 @@ void wxRichTextBuffer::CleanUpHandlers() sm_handlers.Clear(); } -wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save) +wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* types) { + if (types) + types->Clear(); + wxString wildcard; wxList::compatibility_iterator node = GetHandlers().GetFirst(); @@ -3642,6 +3758,8 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save) wildcard += handler->GetExtension(); wildcard += wxT(")|*."); wildcard += handler->GetExtension(); + if (types) + types->Add(handler->GetType()); } count ++; } @@ -3659,7 +3777,13 @@ bool wxRichTextBuffer::LoadFile(const wxString& filename, int type) { wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type); if (handler) - return handler->LoadFile(this, filename); + { + SetDefaultStyle(wxTextAttrEx()); + + bool success = handler->LoadFile(this, filename); + Invalidate(wxRICHTEXT_ALL); + return success; + } else return false; } @@ -3679,7 +3803,12 @@ bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type) { wxRichTextFileHandler* handler = FindHandler(type); if (handler) - return handler->LoadFile(this, stream); + { + SetDefaultStyle(wxTextAttrEx()); + bool success = handler->LoadFile(this, stream); + Invalidate(wxRICHTEXT_ALL); + return success; + } else return false; } @@ -3698,12 +3827,16 @@ bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type) bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range) { bool success = false; +#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ wxString text = GetTextForRange(range); - if (wxTheClipboard->Open()) + if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open()) { success = wxTheClipboard->SetData(new wxTextDataObject(text)); wxTheClipboard->Close(); } +#else + wxUnusedVar(range); +#endif return success; } @@ -3711,6 +3844,7 @@ bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range) bool wxRichTextBuffer::PasteFromClipboard(long position) { bool success = false; +#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ if (CanPasteFromClipboard()) { if (wxTheClipboard->Open()) @@ -3720,6 +3854,7 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) wxTextDataObject data; wxTheClipboard->GetData(data); wxString text(data.GetText()); + text.Replace(_T("\r\n"), _T("\n")); InsertTextWithUndo(position+1, text, GetRichTextCtrl()); @@ -3751,6 +3886,9 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) wxTheClipboard->Close(); } } +#else + wxUnusedVar(position); +#endif return success; } @@ -3758,7 +3896,8 @@ bool wxRichTextBuffer::PasteFromClipboard(long position) bool wxRichTextBuffer::CanPasteFromClipboard() const { bool canPaste = false; - if (wxTheClipboard->Open()) +#if wxUSE_CLIPBOARD && wxUSE_DATAOBJ + if (!wxTheClipboard->IsOpened() && wxTheClipboard->Open()) { if (wxTheClipboard->IsSupported(wxDF_TEXT) || wxTheClipboard->IsSupported(wxDF_BITMAP)) { @@ -3766,6 +3905,7 @@ bool wxRichTextBuffer::CanPasteFromClipboard() const } wxTheClipboard->Close(); } +#endif return canPaste; } @@ -3827,7 +3967,7 @@ void wxRichTextCommand::AddAction(wxRichTextAction* action) bool wxRichTextCommand::Do() { - for (wxNode* node = m_actions.GetFirst(); node; node = node->GetNext()) + for (wxList::compatibility_iterator node = m_actions.GetFirst(); node; node = node->GetNext()) { wxRichTextAction* action = (wxRichTextAction*) node->GetData(); action->Do(); @@ -3838,7 +3978,7 @@ bool wxRichTextCommand::Do() bool wxRichTextCommand::Undo() { - for (wxNode* node = m_actions.GetLast(); node; node = node->GetPrevious()) + for (wxList::compatibility_iterator node = m_actions.GetLast(); node; node = node->GetPrevious()) { wxRichTextAction* action = (wxRichTextAction*) node->GetData(); action->Undo(); @@ -3886,6 +4026,7 @@ bool wxRichTextAction::Do() { m_buffer->InsertFragment(GetPosition(), m_newParagraphs); m_buffer->UpdateRanges(); + m_buffer->Invalidate(GetRange()); long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength() - 1; if (m_newParagraphs.GetPartialParagraph()) @@ -3899,6 +4040,7 @@ bool wxRichTextAction::Do() { m_buffer->DeleteRange(GetRange()); m_buffer->UpdateRanges(); + m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart())); UpdateAppearance(GetRange().GetStart()-1, true /* send update event */); @@ -3907,6 +4049,7 @@ bool wxRichTextAction::Do() case wxRICHTEXT_CHANGE_STYLE: { ApplyParagraphs(GetNewParagraphs()); + m_buffer->Invalidate(GetRange()); UpdateAppearance(GetPosition()); @@ -3929,6 +4072,7 @@ bool wxRichTextAction::Undo() { m_buffer->DeleteRange(GetRange()); m_buffer->UpdateRanges(); + m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart())); long newCaretPosition = GetPosition() - 1; // if (m_newParagraphs.GetPartialParagraph()) @@ -3942,6 +4086,7 @@ bool wxRichTextAction::Undo() { m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs); m_buffer->UpdateRanges(); + m_buffer->Invalidate(GetRange()); UpdateAppearance(GetPosition(), true /* send update event */); @@ -3950,6 +4095,7 @@ bool wxRichTextAction::Undo() case wxRICHTEXT_CHANGE_STYLE: { ApplyParagraphs(GetOldParagraphs()); + m_buffer->Invalidate(GetRange()); UpdateAppearance(GetPosition()); @@ -3970,9 +4116,9 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent m_ctrl->SetCaretPosition(caretPosition); if (!m_ctrl->IsFrozen()) { - m_ctrl->Layout(); + m_ctrl->LayoutContent(); m_ctrl->PositionCaret(); - m_ctrl->Refresh(); + m_ctrl->Refresh(false); if (sendUpdateEvent) m_ctrl->SendUpdateEvent(); @@ -4228,23 +4374,23 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, i (attr1.GetRightIndent() != attr2.GetRightIndent())) return false; - if ((flags && wxTEXT_ATTR_PARA_SPACING_AFTER) && + if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) && (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter())) return false; - if ((flags && wxTEXT_ATTR_PARA_SPACING_BEFORE) && + if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) && (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore())) return false; - if ((flags && wxTEXT_ATTR_LINE_SPACING) && + if ((flags & wxTEXT_ATTR_LINE_SPACING) && (attr1.GetLineSpacing() != attr2.GetLineSpacing())) return false; - if ((flags && wxTEXT_ATTR_CHARACTER_STYLE_NAME) && + if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) && (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName())) return false; - if ((flags && wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && + if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName())) return false; @@ -4310,23 +4456,23 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2, (attr1.GetRightIndent() != attr2.GetRightIndent())) return false; - if ((flags && wxTEXT_ATTR_PARA_SPACING_AFTER) && + if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) && (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter())) return false; - if ((flags && wxTEXT_ATTR_PARA_SPACING_BEFORE) && + if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) && (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore())) return false; - if ((flags && wxTEXT_ATTR_LINE_SPACING) && + if ((flags & wxTEXT_ATTR_LINE_SPACING) && (attr1.GetLineSpacing() != attr2.GetLineSpacing())) return false; - if ((flags && wxTEXT_ATTR_CHARACTER_STYLE_NAME) && + if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) && (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName())) return false; - if ((flags && wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && + if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName())) return false; @@ -4645,6 +4791,9 @@ void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const wxFont wxRichTextAttr::CreateFont() const { wxFont font(m_fontSize, wxDEFAULT, m_fontStyle, m_fontWeight, m_fontUnderlined, m_fontFaceName); +#ifdef __WXMAC__ + font.SetNoAntiAliasing(true); +#endif return font; } @@ -4725,8 +4874,8 @@ bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& f wxFFileInputStream stream(filename); if (stream.Ok()) return LoadFile(buffer, stream); - else - return false; + + return false; } bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& filename) @@ -4734,8 +4883,8 @@ bool wxRichTextFileHandler::SaveFile(wxRichTextBuffer *buffer, const wxString& f wxFFileOutputStream stream(filename); if (stream.Ok()) return SaveFile(buffer, stream); - else - return false; + + return false; } #endif // wxUSE_STREAMS @@ -4762,14 +4911,22 @@ bool wxRichTextPlainTextHandler::DoLoadFile(wxRichTextBuffer *buffer, wxInputStr return false; wxString str; - int ch = 0; + int lastCh = 0; while (!stream.Eof()) { - ch = stream.GetC(); + int ch = stream.GetC(); - if (ch > 0) - str += wxChar(ch); + if (!stream.Eof()) + { + if (ch == 10 && lastCh != 13) + str += wxT('\n'); + + if (ch > 0 && ch != 10) + str += wxChar(ch); + + lastCh = ch; + } } buffer->Clear(); @@ -4826,8 +4983,7 @@ void wxRichTextImageBlock::Init() void wxRichTextImageBlock::Clear() { - if (m_data) - delete m_data; + delete[] m_data; m_data = NULL; m_dataSize = 0; m_imageType = -1; @@ -5061,4 +5217,3 @@ bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* b #endif // wxUSE_RICHTEXT -