X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dadd4f5523e6ab9b489632f478958cd6dc8d03aa..032bc940fcde34cc649eaa111cd6aff1cda66104:/src/richtext/richtextbuffer.cpp diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 9cdcf263c4..064e792bad 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -43,6 +43,9 @@ WX_DEFINE_LIST(wxRichTextObjectList) WX_DEFINE_LIST(wxRichTextLineList) +// Switch off if the platform doesn't like it for some reason +#define wxRICHTEXT_USE_OPTIMIZED_DRAWING 1 + /*! * wxRichTextObject * This is the base for drawable objects. @@ -103,11 +106,21 @@ void wxRichTextObject::SetMargins(int leftMargin, int rightMargin, int topMargin m_bottomMargin = bottomMargin; } -// Convert units in tends of a millimetre to device units +// Convert units in tenths of a millimetre to device units int wxRichTextObject::ConvertTenthsMMToPixels(wxDC& dc, int units) { - int ppi = dc.GetPPI().x; + int p = ConvertTenthsMMToPixels(dc.GetPPI().x, units); + + // Unscale + wxRichTextBuffer* buffer = GetBuffer(); + if (buffer) + p = (int) ((double)p / buffer->GetScale()); + return p; +} +// Convert units in tenths of a millimetre to device units +int wxRichTextObject::ConvertTenthsMMToPixels(int ppi, int units) +{ // There are ppi pixels in 254.1 "1/10 mm" double pixels = ((double) units * (double)ppi) / 254.1; @@ -123,6 +136,14 @@ void wxRichTextObject::Dump(wxTextOutputStream& stream) stream << wxString::Format(wxT("Text colour: %d,%d,%d."), (int) m_attributes.GetTextColour().Red(), (int) m_attributes.GetTextColour().Green(), (int) m_attributes.GetTextColour().Blue()) << wxT("\n"); } +/// Gets the containing buffer +wxRichTextBuffer* wxRichTextObject::GetBuffer() const +{ + const wxRichTextObject* obj = this; + while (obj && !obj->IsKindOf(CLASSINFO(wxRichTextBuffer))) + obj = obj->GetParent(); + return wxDynamicCast(obj, wxRichTextBuffer); +} /*! * wxRichTextCompositeObject @@ -508,12 +529,17 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, const wxRichTextRange& range, { wxRect childRect(child->GetPosition(), child->GetCachedSize()); - if (childRect.GetTop() > rect.GetBottom() || childRect.GetBottom() < rect.GetTop()) + if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) == 0) && childRect.GetTop() > rect.GetBottom()) + { + // Stop drawing + break; + } + else if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) == 0) && childRect.GetBottom() < rect.GetTop()) { // Skip } else - child->Draw(dc, child->GetRange(), selectionRange, childRect, descent, style); + child->Draw(dc, range, selectionRange, childRect, descent, style); } node = node->GetNext(); @@ -528,7 +554,10 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, const wxRect& rect, int styl 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. + // the visible part of the buffer. This is used in wxRichTextCtrl::OnSize, + // so that during a size, only the visible part will be relaid out, or + // it would take too long causing flicker. As an approximation, we assume that + // everything up to the start of the visible area is laid out correctly. if (formatRect) { availableSpace = wxRect(0 + m_leftMargin, @@ -880,8 +909,12 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, { #if wxRICHTEXT_USE_DYNAMIC_STYLES // Don't use the base style, just the default style, and the base style will - // be combined at display time - wxTextAttrEx style(GetDefaultStyle()); + // be combined at display time. + // Divide into paragraph and character styles. + + wxTextAttrEx defaultCharStyle; + wxTextAttrEx defaultParaStyle; + wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); #else wxTextAttrEx style(GetAttributes()); @@ -889,10 +922,14 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, // then the attributes will remain the 'basic style' (i.e. the // layout box's style). wxRichTextApplyStyle(style, GetDefaultStyle()); + + wxTextAttrEx defaultCharStyle = style; + wxTextAttrEx defaultParaStyle = style; #endif - wxRichTextParagraph* para = new wxRichTextParagraph(text, this, & style); - if (paraStyle) - para->SetAttributes(*paraStyle); + wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle; + wxTextAttrEx* cStyle = & defaultCharStyle; + + wxRichTextParagraph* para = new wxRichTextParagraph(text, this, pStyle, cStyle); AppendChild(para); @@ -907,23 +944,27 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text { #if wxRICHTEXT_USE_DYNAMIC_STYLES // Don't use the base style, just the default style, and the base style will - // be combined at display time - wxTextAttrEx style(GetDefaultStyle()); + // be combined at display time. + // Divide into paragraph and character styles. + + wxTextAttrEx defaultCharStyle; + wxTextAttrEx defaultParaStyle; + wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); #else wxTextAttrEx style(GetAttributes()); - //wxLogDebug("Initial style = %s", style.GetFont().GetFaceName()); - //wxLogDebug("Initial size = %d", style.GetFont().GetPointSize()); - // Apply default style. If the style has no attributes set, // then the attributes will remain the 'basic style' (i.e. the // layout box's style). wxRichTextApplyStyle(style, GetDefaultStyle()); - //wxLogDebug("Style after applying default style = %s", style.GetFont().GetFaceName()); - //wxLogDebug("Size after applying default style = %d", style.GetFont().GetPointSize()); + wxTextAttrEx defaultCharStyle = style; + wxTextAttrEx defaultParaStyle = style; #endif + wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle; + wxTextAttrEx* cStyle = & defaultCharStyle; + wxRichTextParagraph* firstPara = NULL; wxRichTextParagraph* lastPara = NULL; @@ -932,9 +973,7 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text size_t i = 0; size_t len = text.length(); wxString line; - wxRichTextParagraph* para = new wxRichTextParagraph(wxT(""), this, & style); - if (paraStyle) - para->SetAttributes(*paraStyle); + wxRichTextParagraph* para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle); AppendChild(para); @@ -949,15 +988,10 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData(); plainText->SetText(line); - para = new wxRichTextParagraph(wxT(""), this, & style); - if (paraStyle) - para->SetAttributes(*paraStyle); + para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle); AppendChild(para); - //if (!firstPara) - // firstPara = para; - lastPara = para; line = wxEmptyString; } @@ -973,18 +1007,6 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text plainText->SetText(line); } -/* - if (firstPara) - range.SetStart(firstPara->GetRange().GetStart()); - else if (lastPara) - range.SetStart(lastPara->GetRange().GetStart()); - - if (lastPara) - range.SetEnd(lastPara->GetRange().GetEnd()); - else if (firstPara) - range.SetEnd(firstPara->GetRange().GetEnd()); -*/ - UpdateRanges(); SetDirty(false); @@ -997,8 +1019,12 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxT { #if wxRICHTEXT_USE_DYNAMIC_STYLES // Don't use the base style, just the default style, and the base style will - // be combined at display time - wxTextAttrEx style(GetDefaultStyle()); + // be combined at display time. + // Divide into paragraph and character styles. + + wxTextAttrEx defaultCharStyle; + wxTextAttrEx defaultParaStyle; + wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle); #else wxTextAttrEx style(GetAttributes()); @@ -1006,14 +1032,17 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxT // then the attributes will remain the 'basic style' (i.e. the // layout box's style). wxRichTextApplyStyle(style, GetDefaultStyle()); + + wxTextAttrEx defaultCharStyle = style; + wxTextAttrEx defaultParaStyle = style; #endif - wxRichTextParagraph* para = new wxRichTextParagraph(this, & style); - AppendChild(para); - para->AppendChild(new wxRichTextImage(image, this)); + wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle; + wxTextAttrEx* cStyle = & defaultCharStyle; - if (paraStyle) - para->SetAttributes(*paraStyle); + wxRichTextParagraph* para = new wxRichTextParagraph(this, pStyle); + AppendChild(para); + para->AppendChild(new wxRichTextImage(image, this, cStyle)); UpdateRanges(); SetDirty(true); @@ -1025,8 +1054,6 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxT /// Insert fragment into this box at the given position. If partialParagraph is true, /// it is assumed that the last (or only) paragraph is just a piece of data with no paragraph /// marker. -/// TODO: if fragment is inserted inside styled fragment, must apply that style to -/// to the data (if it has a default style, anyway). bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParagraphLayoutBox& fragment) { @@ -1056,6 +1083,11 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph); wxASSERT (firstPara != NULL); + // Apply the new paragraph attributes to the existing paragraph + wxTextAttrEx attr(para->GetAttributes()); + wxRichTextApplyStyle(attr, firstPara->GetAttributes()); + para->SetAttributes(attr); + wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst(); while (objectNode) { @@ -1162,9 +1194,6 @@ bool wxRichTextParagraphLayoutBox::InsertFragment(long position, wxRichTextParag if (finalPara->GetChildCount() == 0) { wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString); -#if !wxRICHTEXT_USE_DYNAMIC_STYLES - text->SetAttributes(finalPara->GetAttributes()); -#endif finalPara->AppendChild(text); } @@ -1617,7 +1646,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const } else newPara = para; - + if (paragraphStyle && !charactersOnly) { if (applyMinimal) @@ -2153,24 +2182,58 @@ bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, cons currentStyle.SetBulletNumber(style.GetBulletNumber()); } - if (style.HasBulletSymbol() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_SYMBOL)) + if (style.HasBulletText() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_TEXT)) { - if (currentStyle.HasBulletSymbol()) + if (currentStyle.HasBulletText()) { - if (currentStyle.HasBulletSymbol() != style.HasBulletSymbol()) + if (currentStyle.HasBulletText() != style.HasBulletText()) { // Clash of style - mark as such - multipleStyleAttributes |= wxTEXT_ATTR_BULLET_SYMBOL; - currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_SYMBOL); + multipleStyleAttributes |= wxTEXT_ATTR_BULLET_TEXT; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_TEXT); } } else { - currentStyle.SetBulletSymbol(style.GetBulletSymbol()); + currentStyle.SetBulletText(style.GetBulletText()); currentStyle.SetBulletFont(style.GetBulletFont()); } } + if (style.HasBulletName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NAME)) + { + if (currentStyle.HasBulletName()) + { + if (currentStyle.HasBulletName() != style.HasBulletName()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_BULLET_NAME; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_BULLET_NAME); + } + } + else + { + currentStyle.SetBulletName(style.GetBulletName()); + } + } + + if (style.HasURL() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_URL)) + { + if (currentStyle.HasURL()) + { + if (currentStyle.HasURL() != style.HasURL()) + { + // Clash of style - mark as such + multipleStyleAttributes |= wxTEXT_ATTR_URL; + currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_URL); + } + } + else + { + currentStyle.SetURL(style.GetURL()); + } + } + return true; } @@ -2234,19 +2297,7 @@ bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range /// Set default style bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttrEx& style) { - // I don't think the default style should be combined with the previous - // default style. m_defaultAttributes = style; - -#if 0 - // keep the old attributes if the new style doesn't specify them unless the - // new style is empty - then reset m_defaultStyle (as there is no other way - // to do it) - if ( style.IsDefault() ) - m_defaultAttributes = style; - else - m_defaultAttributes = wxTextAttrEx::CombineEx(style, m_defaultAttributes, NULL); -#endif return true; } @@ -2365,6 +2416,8 @@ void wxRichTextParagraphLayoutBox::Reset() Clear(); AddParagraph(wxEmptyString); + + Invalidate(wxRICHTEXT_ALL); } /// Invalidate the buffer. With no argument, invalidates whole buffer. @@ -2433,7 +2486,7 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh // Problem: when changing from one list style to another, there's a danger that the level info will get lost. // So when changing a list style interactively, could retrieve level based on current style, then // set appropriate indent and apply new style. - + if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty()) { int currentIndent = para->GetAttributes().GetLeftIndent(); @@ -2467,9 +2520,9 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh wxRichTextListStyleDefinition* listDef = styleSheet->FindListStyle(para->GetAttributes().GetListStyleName()); - // Overall list definition style + // Overall list definition style para->GetAttributes() = listDef->GetStyle(); - + // Style for this level wxRichTextApplyStyle(para->GetAttributes(), * listDef->GetLevelAttributes(listDef->FindLevelForIndent(currentIndent))); @@ -2498,10 +2551,10 @@ bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wx // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0); bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0); bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0); - + // Current number, if numbering int n = startFrom; - + wxASSERT (!specifyLevel || (specifyLevel && (specifiedLevel >= 0))); // If we are associated with a control, make undoable; otherwise, apply immediately @@ -2546,12 +2599,12 @@ bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wx } else newPara = para; - + if (def) { int thisIndent = newPara->GetAttributes().GetLeftIndent(); int thisLevel = specifyLevel ? specifiedLevel : def->FindLevelForIndent(thisIndent); - + // How is numbering going to work? // If we are renumbering, or numbering for the first time, we need to keep // track of the number for each level. But we might be simply applying a different @@ -2563,13 +2616,13 @@ bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wx // Apply the overall list style, and item style for this level wxTextAttrEx listStyle(def->GetCombinedStyleForLevel(thisLevel)); wxRichTextApplyStyle(newPara->GetAttributes(), listStyle); - - // Now we need to check numbering + + // Now we need to do numbering if (renumber) { newPara->GetAttributes().SetBulletNumber(n); } - + n ++; } else if (!newPara->GetAttributes().GetListStyleName().IsEmpty()) @@ -2579,10 +2632,11 @@ bool wxRichTextParagraphLayoutBox::SetListStyle(const wxRichTextRange& range, wx newPara->GetAttributes().SetListStyleName(wxEmptyString); newPara->GetAttributes().SetLeftIndent(0, 0); - + newPara->GetAttributes().SetBulletText(wxEmptyString); + // Eliminate the main list-related attributes - newPara->GetAttributes().SetFlags(newPara->GetAttributes().GetFlags() & ~wxTEXT_ATTR_LEFT_INDENT & ~wxTEXT_ATTR_BULLET_STYLE & ~wxTEXT_ATTR_BULLET_NUMBER & ~wxTEXT_ATTR_BULLET_SYMBOL & wxTEXT_ATTR_LIST_STYLE_NAME); - + newPara->GetAttributes().SetFlags(newPara->GetAttributes().GetFlags() & ~wxTEXT_ATTR_LEFT_INDENT & ~wxTEXT_ATTR_BULLET_STYLE & ~wxTEXT_ATTR_BULLET_NUMBER & ~wxTEXT_ATTR_BULLET_TEXT & wxTEXT_ATTR_LIST_STYLE_NAME); + wxRichTextStyleSheet* styleSheet = GetStyleSheet(); if (styleSheet && !newPara->GetAttributes().GetParagraphStyleName().IsEmpty()) { @@ -2635,31 +2689,33 @@ bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, co { bool withUndo = ((flags & wxRICHTEXT_SETSTYLE_WITH_UNDO) != 0); // bool applyMinimal = ((flags & wxRICHTEXT_SETSTYLE_OPTIMIZE) != 0); +#ifdef __WXDEBUG__ bool specifyLevel = ((flags & wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL) != 0); +#endif bool renumber = ((flags & wxRICHTEXT_SETSTYLE_RENUMBER) != 0); - + // Max number of levels const int maxLevels = 10; - + // The level we're looking at now int currentLevel = -1; - + // The item number for each level int levels[maxLevels]; int i; - + // Reset all numbering for (i = 0; i < maxLevels; i++) { if (startFrom != -1) - levels[i] = startFrom; + levels[i] = startFrom-1; else if (renumber) // start again - levels[i] = 1; + levels[i] = 0; else levels[i] = -1; // start from the number we found, if any } - + wxASSERT(!specifyLevel || (specifyLevel && (specifiedLevel >= 0))); // If we are associated with a control, make undoable; otherwise, apply immediately @@ -2704,26 +2760,25 @@ bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, co } else newPara = para; - + wxRichTextListStyleDefinition* defToUse = def; if (!defToUse) { wxRichTextStyleSheet* sheet = GetStyleSheet(); - + if (sheet && !newPara->GetAttributes().GetListStyleName().IsEmpty()) defToUse = sheet->FindListStyle(newPara->GetAttributes().GetListStyleName()); } - + if (defToUse) { int thisIndent = newPara->GetAttributes().GetLeftIndent(); int thisLevel = defToUse->FindLevelForIndent(thisIndent); - // If the paragraph doesn't have an indent, or we've specified a level to apply to all, - // change the level. - if (thisIndent == 0 || specifiedLevel != -1) + // If we've specified a level to apply to all, change the level. + if (specifiedLevel != -1) thisLevel = specifiedLevel; - + // Do promotion if specified if ((promoteBy != 0) && !para->GetRange().IsOutside(promotionRange)) { @@ -2733,16 +2788,16 @@ bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, co if (thisLevel > 9) thisLevel = 9; } - + // Apply the overall list style, and item style for this level wxTextAttrEx listStyle(defToUse->GetCombinedStyleForLevel(thisLevel)); wxRichTextApplyStyle(newPara->GetAttributes(), listStyle); - + // OK, we've (re)applied the style, now let's get the numbering right. - + if (currentLevel == -1) currentLevel = thisLevel; - + // Same level as before, do nothing except increment level's number afterwards if (currentLevel == thisLevel) { @@ -2752,14 +2807,14 @@ bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, co { for (i = currentLevel+1; i <= thisLevel; i++) { - levels[i] = 1; + levels[i] = 0; } currentLevel = thisLevel; } else if (thisLevel < currentLevel) { currentLevel = thisLevel; - } + } // Use the current numbering if -1 and we have a bullet number already if (levels[currentLevel] == -1) @@ -2769,10 +2824,25 @@ bool wxRichTextParagraphLayoutBox::DoNumberList(const wxRichTextRange& range, co else levels[currentLevel] = 1; } - + else + { + levels[currentLevel] ++; + } + newPara->GetAttributes().SetBulletNumber(levels[currentLevel]); - levels[currentLevel] ++; + // Create the bullet text if an outline list + if (listStyle.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) + { + wxString text; + for (i = 0; i <= currentLevel; i++) + { + if (!text.IsEmpty()) + text += wxT("."); + text += wxString::Format(wxT("%d"), levels[i]); + } + newPara->GetAttributes().SetBulletText(text); + } } } } @@ -2811,9 +2881,9 @@ bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRa // list position will start from 1. // Similarly, we look after the last para in the promote range for an indentation that is less (or no list style). // We can end the renumbering at this point. - + // For now, only renumber within the promotion range. - + return DoNumberList(range, range, promoteBy, def, flags, 1, specifiedLevel); } @@ -2829,6 +2899,61 @@ bool wxRichTextParagraphLayoutBox::PromoteList(int promoteBy, const wxRichTextRa return false; } +/// Fills in the attributes for numbering a paragraph after previousParagraph. It also finds the +/// position of the paragraph that it had to start looking from. +bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph* previousParagraph, wxRichTextAttr& attr) const +{ + if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE) + return false; + + wxRichTextStyleSheet* sheet = GetStyleSheet(); + if (sheet && !previousParagraph->GetAttributes().GetListStyleName().IsEmpty()) + { + wxRichTextListStyleDefinition* def = sheet->FindListStyle(previousParagraph->GetAttributes().GetListStyleName()); + if (def) + { + // int thisIndent = previousParagraph->GetAttributes().GetLeftIndent(); + // int thisLevel = def->FindLevelForIndent(thisIndent); + + bool isOutline = (previousParagraph->GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) != 0; + + attr.SetFlags(previousParagraph->GetAttributes().GetFlags() & (wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_TEXT|wxTEXT_ATTR_BULLET_NAME)); + if (previousParagraph->GetAttributes().HasBulletName()) + attr.SetBulletName(previousParagraph->GetAttributes().GetBulletName()); + attr.SetBulletStyle(previousParagraph->GetAttributes().GetBulletStyle()); + attr.SetListStyleName(previousParagraph->GetAttributes().GetListStyleName()); + + int nextNumber = previousParagraph->GetAttributes().GetBulletNumber() + 1; + attr.SetBulletNumber(nextNumber); + + if (isOutline) + { + wxString text = previousParagraph->GetAttributes().GetBulletText(); + if (!text.IsEmpty()) + { + int pos = text.Find(wxT('.'), true); + if (pos != wxNOT_FOUND) + { + text = text.Mid(0, text.Length() - pos - 1); + } + else + text = wxEmptyString; + if (!text.IsEmpty()) + text += wxT("."); + text += wxString::Format(wxT("%d"), nextNumber); + attr.SetBulletText(text); + } + } + + return true; + } + else + return false; + } + else + return false; +} + /*! * wxRichTextParagraph * This object represents a single paragraph (or in a straight text editor, a line). @@ -2841,21 +2966,17 @@ wxArrayInt wxRichTextParagraph::sm_defaultTabs; wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttrEx* style): wxRichTextBox(parent) { - if (parent && !style) - SetAttributes(parent->GetAttributes()); if (style) SetAttributes(*style); } -wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style): +wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* paraStyle, wxTextAttrEx* charStyle): wxRichTextBox(parent) { - if (parent && !style) - SetAttributes(parent->GetAttributes()); - if (style) - SetAttributes(*style); + if (paraStyle) + SetAttributes(*paraStyle); - AppendChild(new wxRichTextPlainText(text, this)); + AppendChild(new wxRichTextPlainText(text, this, charStyle)); } wxRichTextParagraph::~wxRichTextParagraph() @@ -2864,7 +2985,7 @@ wxRichTextParagraph::~wxRichTextParagraph() } /// Draw the item -bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style) +bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextRange& selectionRange, const wxRect& WXUNUSED(rect), int WXUNUSED(descent), int style) { #if wxRICHTEXT_USE_DYNAMIC_STYLES wxTextAttrEx attr = GetCombinedAttributes(); @@ -2880,62 +3001,51 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore()); int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent()); - if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP) + wxTextAttrEx bulletAttr(GetCombinedAttributes()); + + // Get line height from first line, if any + wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL; + + wxPoint linePos; + int lineHeight wxDUMMY_INITIALIZE(0); + if (line) { - // TODO + lineHeight = line->GetSize().y; + linePos = line->GetPosition() + GetPosition(); } else { - wxString bulletText = GetBulletText(); - if (!bulletText.empty()) - { - // Get the combined font, or if a font is specified for a symbol bullet, - // create the font - - wxTextAttrEx bulletAttr(GetCombinedAttributes()); - wxFont font; - if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && bulletAttr.GetFont().Ok()) - { - font = (*wxTheFontList->FindOrCreateFont(bulletAttr.GetFont().GetPointSize(), bulletAttr.GetFont().GetFamily(), - bulletAttr.GetFont().GetStyle(), bulletAttr.GetFont().GetWeight(), bulletAttr.GetFont().GetUnderlined(), - attr.GetBulletFont())); - } - else if (bulletAttr.GetFont().Ok()) - font = bulletAttr.GetFont(); - else - font = (*wxNORMAL_FONT); - - dc.SetFont(font); - - if (bulletAttr.GetTextColour().Ok()) - dc.SetTextForeground(bulletAttr.GetTextColour()); - - dc.SetBackgroundMode(wxTRANSPARENT); - - // Get line height from first line, if any - wxRichTextLine* line = m_cachedLines.GetFirst() ? (wxRichTextLine* ) m_cachedLines.GetFirst()->GetData() : (wxRichTextLine*) NULL; + wxFont font; + if (bulletAttr.GetFont().Ok()) + font = bulletAttr.GetFont(); + else + font = (*wxNORMAL_FONT); - wxPoint linePos; - int lineHeight wxDUMMY_INITIALIZE(0); - if (line) - { - lineHeight = line->GetSize().y; - linePos = line->GetPosition() + GetPosition(); - } - else - { - lineHeight = dc.GetCharHeight(); - linePos = GetPosition(); - linePos.y += spaceBeforePara; - } + dc.SetFont(font); - int charHeight = dc.GetCharHeight(); + lineHeight = dc.GetCharHeight(); + linePos = GetPosition(); + linePos.y += spaceBeforePara; + } - int x = GetPosition().x + leftIndent; - int y = linePos.y + (lineHeight - charHeight); + wxRect bulletRect(GetPosition().x + leftIndent, linePos.y, linePos.x - (GetPosition().x + leftIndent), lineHeight); - dc.DrawText(bulletText, x, y); - } + if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_BITMAP) + { + if (wxRichTextBuffer::GetRenderer()) + wxRichTextBuffer::GetRenderer()->DrawBitmapBullet(this, dc, bulletAttr, bulletRect); + } + else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_STANDARD) + { + if (wxRichTextBuffer::GetRenderer()) + wxRichTextBuffer::GetRenderer()->DrawStandardBullet(this, dc, bulletAttr, bulletRect); + } + else + { + wxString bulletText = GetBulletText(); + + if (!bulletText.empty() && wxRichTextBuffer::GetRenderer()) + wxRichTextBuffer::GetRenderer()->DrawTextBullet(this, dc, bulletAttr, bulletRect, bulletText); } } } @@ -2960,7 +3070,8 @@ bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& WXUNUSED(range), while (node2) { wxRichTextObject* child = node2->GetData(); - if (!child->GetRange().IsOutside(lineRange)) + + if (!child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range)) { // Draw this part of the line at the correct position wxRichTextRange objectRange(child->GetRange()); @@ -3228,7 +3339,7 @@ void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttrEx& attr, const wx } else if (attr.HasAlignment() && GetAttributes().GetAlignment() == wxTEXT_ALIGNMENT_RIGHT) { - pos.x = rect.GetRight() - size.x; + pos.x = pos.x + rect.GetWidth() - size.x; line->SetPosition(pos); } @@ -3779,7 +3890,7 @@ wxString wxRichTextParagraph::GetBulletText() int number = GetAttributes().GetBulletNumber(); wxString text; - if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC) + if ((GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ARABIC) || (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE)) { text.Printf(wxT("%d"), number); } @@ -3804,13 +3915,28 @@ wxString wxRichTextParagraph::GetBulletText() } else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) { - text = GetAttributes().GetBulletSymbol(); + text = GetAttributes().GetBulletText(); + } + + if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_OUTLINE) + { + // The outline style relies on the text being computed statically, + // since it depends on other levels points (e.g. 1.2.1.1). So normally the bullet text + // should be stored in the attributes; if not, just use the number for this + // level, as previously computed. + if (!GetAttributes().GetBulletText().IsEmpty()) + text = GetAttributes().GetBulletText(); } if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PARENTHESES) { text = wxT("(") + text + wxT(")"); } + else if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_RIGHT_PARENTHESIS) + { + text = text + wxT(")"); + } + if (GetAttributes().GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_PERIOD) { text += wxT("."); @@ -3956,8 +4082,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject) wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style): wxRichTextObject(parent) { - if (parent && !style) - SetAttributes(parent->GetAttributes()); if (style) SetAttributes(*style); @@ -4030,12 +4154,12 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR // Compensate for kerning difference wxString stringFragment2(m_text.Mid(r1 - offset, fragmentLen+1)); wxString stringFragment3(m_text.Mid(r1 - offset + fragmentLen, 1)); - + wxCoord w1, h1, w2, h2, w3, h3; dc.GetTextExtent(stringFragment, & w1, & h1); dc.GetTextExtent(stringFragment2, & w2, & h2); dc.GetTextExtent(stringFragment3, & w3, & h3); - + int kerningDiff = (w1 + w3) - w2; x = x - kerningDiff; } @@ -4061,12 +4185,12 @@ bool wxRichTextPlainText::Draw(wxDC& dc, const wxRichTextRange& range, const wxR // Compensate for kerning difference wxString stringFragment2(m_text.Mid(s1 - offset, fragmentLen+1)); wxString stringFragment3(m_text.Mid(s1 - offset + fragmentLen, 1)); - + wxCoord w1, h1, w2, h2, w3, h3; dc.GetTextExtent(stringFragment, & w1, & h1); dc.GetTextExtent(stringFragment2, & w2, & h2); dc.GetTextExtent(stringFragment3, & w3, & h3); - + int kerningDiff = (w1 + w3) - w2; x = x - kerningDiff; } @@ -4243,14 +4367,14 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz tabArray = textAttr.GetTabs(); int tabCount = tabArray.GetCount(); - + for (int i = 0; i < tabCount; ++i) { int pos = tabArray[i]; pos = ((wxRichTextPlainText*) this)->ConvertTenthsMMToPixels(dc, pos); tabArray[i] = pos; } - + int nextTabPos = -1; while (stringChunk.Find(wxT('\t')) >= 0) @@ -4380,7 +4504,10 @@ void wxRichTextPlainText::Dump(wxTextOutputStream& stream) IMPLEMENT_DYNAMIC_CLASS(wxRichTextBuffer, wxRichTextParagraphLayoutBox) -wxList wxRichTextBuffer::sm_handlers; +wxList wxRichTextBuffer::sm_handlers; +wxRichTextRenderer* wxRichTextBuffer::sm_renderer = NULL; +int wxRichTextBuffer::sm_bulletRightMargin = 20; +float wxRichTextBuffer::sm_bulletProportion = (float) 0.3; /// Initialisation void wxRichTextBuffer::Init() @@ -4391,6 +4518,8 @@ void wxRichTextBuffer::Init() m_batchedCommandDepth = 0; m_batchedCommand = NULL; m_suppressUndo = 0; + m_handlerFlags = 0; + m_scale = 1.0; } /// Initialisation @@ -4400,21 +4529,15 @@ wxRichTextBuffer::~wxRichTextBuffer() delete m_batchedCommand; ClearStyleStack(); + ClearEventHandlers(); } -void wxRichTextBuffer::Clear() +void wxRichTextBuffer::ResetAndClearCommands() { - DeleteChildren(); + Reset(); + GetCommandProcessor()->ClearCommands(); - Modify(false); - Invalidate(wxRICHTEXT_ALL); -} -void wxRichTextBuffer::Reset() -{ - DeleteChildren(); - AddParagraph(wxEmptyString); - GetCommandProcessor()->ClearCommands(); Modify(false); Invalidate(wxRICHTEXT_ALL); } @@ -4437,7 +4560,7 @@ bool wxRichTextBuffer::PushStyleSheet(wxRichTextStyleSheet* styleSheet) styleSheet->InsertSheet(m_styleSheet); SetStyleSheet(styleSheet); - + return true; } @@ -4449,7 +4572,7 @@ wxRichTextStyleSheet* wxRichTextBuffer::PopStyleSheet() wxRichTextStyleSheet* oldSheet = m_styleSheet; m_styleSheet = oldSheet->GetNextSheet(); oldSheet->Unlink(); - + return oldSheet; } else @@ -4461,6 +4584,13 @@ bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagr { wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false); +#if wxRICHTEXT_USE_DYNAMIC_STYLES + wxTextAttrEx attr(GetDefaultStyle()); +#else + wxTextAttrEx attr(GetBasicStyle()); + wxRichTextApplyStyle(attr, GetDefaultStyle()); +#endif + wxTextAttrEx* p = NULL; wxTextAttrEx paraAttr; if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE) @@ -4469,13 +4599,8 @@ bool wxRichTextBuffer::InsertParagraphsWithUndo(long pos, const wxRichTextParagr if (!paraAttr.IsDefault()) p = & paraAttr; } - -#if wxRICHTEXT_USE_DYNAMIC_STYLES - wxTextAttrEx attr(GetDefaultStyle()); -#else - wxTextAttrEx attr(GetBasicStyle()); - wxRichTextApplyStyle(attr, GetDefaultStyle()); -#endif + else + p = & attr; action->GetNewParagraphs() = paragraphs; @@ -4514,13 +4639,6 @@ bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRich p = & paraAttr; } -#if wxRICHTEXT_USE_DYNAMIC_STYLES - wxTextAttrEx attr(GetDefaultStyle()); -#else - wxTextAttrEx attr(GetBasicStyle()); - wxRichTextApplyStyle(attr, GetDefaultStyle()); -#endif - action->GetNewParagraphs().AddParagraphs(text, p); int length = action->GetNewParagraphs().GetRange().GetLength(); @@ -4630,24 +4748,52 @@ wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPos wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition); if (para) { + wxRichTextAttr attr; + bool foundAttributes = false; + + // Look for a matching paragraph style if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && GetStyleSheet()) { wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName()); - if (paraDef && !paraDef->GetNextStyle().IsEmpty()) + if (paraDef) { - wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle()); - if (nextParaDef) - return nextParaDef->GetStyle(); + if (!paraDef->GetNextStyle().IsEmpty()) + { + wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle()); + if (nextParaDef) + { + foundAttributes = true; + attr = nextParaDef->GetStyle(); + } + } + + // If we didn't find the 'next style', use this style instead. + if (!foundAttributes) + { + foundAttributes = true; + attr = paraDef->GetStyle(); + } } } - wxRichTextAttr attr(para->GetAttributes()); - int flags = attr.GetFlags(); + if (!foundAttributes) + { + attr = para->GetAttributes(); + int flags = attr.GetFlags(); - // Eliminate character styles - flags &= ( (~ wxTEXT_ATTR_FONT) | + // Eliminate character styles + flags &= ( (~ wxTEXT_ATTR_FONT) | (~ wxTEXT_ATTR_TEXT_COLOUR) | (~ wxTEXT_ATTR_BACKGROUND_COLOUR) ); - attr.SetFlags(flags); + attr.SetFlags(flags); + } + + // Now see if we need to number the paragraph. + if (attr.HasBulletStyle()) + { + wxRichTextAttr numberingAttr; + if (FindNextParagraphNumber(para, numberingAttr)) + wxRichTextApplyStyle(attr, (const wxRichTextAttr&) numberingAttr); + } return attr; } @@ -4943,7 +5089,7 @@ bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing) bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle) { wxTextAttrEx attr; - attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_LEFT_INDENT); + attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); attr.SetBulletStyle(bulletStyle); attr.SetBulletNumber(bulletNumber); attr.SetLeftIndent(leftIndent, leftSubIndent); @@ -4952,13 +5098,25 @@ bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int } /// Begin symbol bullet -bool wxRichTextBuffer::BeginSymbolBullet(wxChar symbol, int leftIndent, int leftSubIndent, int bulletStyle) +bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle) +{ + wxTextAttrEx attr; + attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); + attr.SetBulletStyle(bulletStyle); + attr.SetLeftIndent(leftIndent, leftSubIndent); + attr.SetBulletText(symbol); + + return BeginStyle(attr); +} + +/// Begin standard bullet +bool wxRichTextBuffer::BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle) { wxTextAttrEx attr; - attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_SYMBOL|wxTEXT_ATTR_LEFT_INDENT); + attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT); attr.SetBulletStyle(bulletStyle); attr.SetLeftIndent(leftIndent, leftSubIndent); - attr.SetBulletSymbol(symbol); + attr.SetBulletName(bulletName); return BeginStyle(attr); } @@ -4995,11 +5153,47 @@ bool wxRichTextBuffer::BeginParagraphStyle(const wxString& paragraphStyle) return false; } -/// Adds a handler to the end -void wxRichTextBuffer::AddHandler(wxRichTextFileHandler *handler) +/// Begin named list style +bool wxRichTextBuffer::BeginListStyle(const wxString& listStyle, int level, int number) { - sm_handlers.Append(handler); -} + if (GetStyleSheet()) + { + wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(listStyle); + if (def) + { + wxTextAttrEx attr(def->GetCombinedStyleForLevel(level)); + + attr.SetBulletNumber(number); + + return BeginStyle(attr); + } + } + return false; +} + +/// Begin URL +bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterStyle) +{ + wxTextAttrEx attr; + + if (!characterStyle.IsEmpty() && GetStyleSheet()) + { + wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle); + if (def) + { + def->GetStyle().CopyTo(attr); + } + } + attr.SetURL(url); + + return BeginStyle(attr); +} + +/// Adds a handler to the end +void wxRichTextBuffer::AddHandler(wxRichTextFileHandler *handler) +{ + sm_handlers.Append(handler); +} /// Inserts a handler at the front void wxRichTextBuffer::InsertHandler(wxRichTextFileHandler *handler) @@ -5151,7 +5345,7 @@ bool wxRichTextBuffer::LoadFile(const wxString& filename, int type) if (handler) { SetDefaultStyle(wxTextAttrEx()); - + handler->SetFlags(GetHandlerFlags()); bool success = handler->LoadFile(this, filename); Invalidate(wxRICHTEXT_ALL); return success; @@ -5165,7 +5359,10 @@ bool wxRichTextBuffer::SaveFile(const wxString& filename, int type) { wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type); if (handler) + { + handler->SetFlags(GetHandlerFlags()); return handler->SaveFile(this, filename); + } else return false; } @@ -5177,6 +5374,7 @@ bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type) if (handler) { SetDefaultStyle(wxTextAttrEx()); + handler->SetFlags(GetHandlerFlags()); bool success = handler->LoadFile(this, stream); Invalidate(wxRICHTEXT_ALL); return success; @@ -5190,7 +5388,10 @@ bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type) { wxRichTextFileHandler* handler = FindHandler(type); if (handler) + { + handler->SetFlags(GetHandlerFlags()); return handler->SaveFile(this, stream); + } else return false; } @@ -5336,6 +5537,234 @@ void wxRichTextBuffer::Dump() wxLogDebug(text); } +/// Add an event handler +bool wxRichTextBuffer::AddEventHandler(wxEvtHandler* handler) +{ + m_eventHandlers.Append(handler); + return true; +} + +/// Remove an event handler +bool wxRichTextBuffer::RemoveEventHandler(wxEvtHandler* handler, bool deleteHandler) +{ + wxList::compatibility_iterator node = m_eventHandlers.Find(handler); + if (node) + { + m_eventHandlers.Erase(node); + if (deleteHandler) + delete handler; + + return true; + } + else + return false; +} + +/// Clear event handlers +void wxRichTextBuffer::ClearEventHandlers() +{ + m_eventHandlers.Clear(); +} + +/// Send event to event handlers. If sendToAll is true, will send to all event handlers, +/// otherwise will stop at the first successful one. +bool wxRichTextBuffer::SendEvent(wxEvent& event, bool sendToAll) +{ + bool success = false; + for (wxList::compatibility_iterator node = m_eventHandlers.GetFirst(); node; node = node->GetNext()) + { + wxEvtHandler* handler = (wxEvtHandler*) node->GetData(); + if (handler->ProcessEvent(event)) + { + success = true; + if (!sendToAll) + return true; + } + } + return success; +} + +/// Set style sheet and notify of the change +bool wxRichTextBuffer::SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet) +{ + wxRichTextStyleSheet* oldSheet = GetStyleSheet(); + + wxWindowID id = wxID_ANY; + if (GetRichTextCtrl()) + id = GetRichTextCtrl()->GetId(); + + wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, id); + event.SetEventObject(GetRichTextCtrl()); + event.SetOldStyleSheet(oldSheet); + event.SetNewStyleSheet(sheet); + event.Allow(); + + if (SendEvent(event) && !event.IsAllowed()) + { + if (sheet != oldSheet) + delete sheet; + + return false; + } + + if (oldSheet && oldSheet != sheet) + delete oldSheet; + + SetStyleSheet(sheet); + + event.SetEventType(wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED); + event.SetOldStyleSheet(NULL); + event.Allow(); + + return SendEvent(event); +} + +/// Set renderer, deleting old one +void wxRichTextBuffer::SetRenderer(wxRichTextRenderer* renderer) +{ + if (sm_renderer) + delete sm_renderer; + sm_renderer = renderer; +} + +bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttrEx& bulletAttr, const wxRect& rect) +{ + if (bulletAttr.GetTextColour().Ok()) + { + dc.SetPen(wxPen(bulletAttr.GetTextColour())); + dc.SetBrush(wxBrush(bulletAttr.GetTextColour())); + } + else + { + dc.SetPen(*wxBLACK_PEN); + dc.SetBrush(*wxBLACK_BRUSH); + } + + wxFont font; + if (bulletAttr.GetFont().Ok()) + font = bulletAttr.GetFont(); + else + font = (*wxNORMAL_FONT); + + dc.SetFont(font); + + int charHeight = dc.GetCharHeight(); + + int bulletWidth = (int) (((float) charHeight) * wxRichTextBuffer::GetBulletProportion()); + int bulletHeight = bulletWidth; + + int x = rect.x; + + // Calculate the top position of the character (as opposed to the whole line height) + int y = rect.y + (rect.height - charHeight); + + // Calculate where the bullet should be positioned + y = y + (charHeight+1)/2 - (bulletHeight+1)/2; + + // The margin between a bullet and text. + int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin()); + + if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT) + x = rect.x + rect.width - bulletWidth - margin; + else if (bulletAttr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE) + x = x + (rect.width)/2 - bulletWidth/2; + + if (bulletAttr.GetBulletName() == wxT("standard/square")) + { + dc.DrawRectangle(x, y, bulletWidth, bulletHeight); + } + else if (bulletAttr.GetBulletName() == wxT("standard/diamond")) + { + wxPoint pts[5]; + pts[0].x = x; pts[0].y = y + bulletHeight/2; + pts[1].x = x + bulletWidth/2; pts[1].y = y; + pts[2].x = x + bulletWidth; pts[2].y = y + bulletHeight/2; + pts[3].x = x + bulletWidth/2; pts[3].y = y + bulletHeight; + + dc.DrawPolygon(4, pts); + } + else if (bulletAttr.GetBulletName() == wxT("standard/triangle")) + { + wxPoint pts[3]; + pts[0].x = x; pts[0].y = y; + pts[1].x = x + bulletWidth; pts[1].y = y + bulletHeight/2; + pts[2].x = x; pts[2].y = y + bulletHeight; + + dc.DrawPolygon(3, pts); + } + else // "standard/circle", and catch-all + { + dc.DrawEllipse(x, y, bulletWidth, bulletHeight); + } + + return true; +} + +bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttrEx& attr, const wxRect& rect, const wxString& text) +{ + if (!text.empty()) + { + wxFont font; + if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && attr.GetFont().Ok()) + { + font = (*wxTheFontList->FindOrCreateFont(attr.GetFont().GetPointSize(), attr.GetFont().GetFamily(), + attr.GetFont().GetStyle(), attr.GetFont().GetWeight(), attr.GetFont().GetUnderlined(), + attr.GetBulletFont())); + } + else if (attr.GetFont().Ok()) + font = attr.GetFont(); + else + font = (*wxNORMAL_FONT); + + dc.SetFont(font); + + if (attr.GetTextColour().Ok()) + dc.SetTextForeground(attr.GetTextColour()); + + dc.SetBackgroundMode(wxTRANSPARENT); + + int charHeight = dc.GetCharHeight(); + wxCoord tw, th; + dc.GetTextExtent(text, & tw, & th); + + int x = rect.x; + + // Calculate the top position of the character (as opposed to the whole line height) + int y = rect.y + (rect.height - charHeight); + + // The margin between a bullet and text. + int margin = paragraph->ConvertTenthsMMToPixels(dc, wxRichTextBuffer::GetBulletRightMargin()); + + if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT) + x = (rect.x + rect.width) - tw - margin; + else if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE) + x = x + (rect.width)/2 - tw/2; + + dc.DrawText(text, x, y); + + return true; + } + else + return false; +} + +bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(paragraph), wxDC& WXUNUSED(dc), const wxTextAttrEx& WXUNUSED(attr), const wxRect& WXUNUSED(rect)) +{ + // Currently unimplemented. The intention is to store bitmaps by name in a media store associated + // with the buffer. The store will allow retrieval from memory, disk or other means. + return false; +} + +/// Enumerate the standard bullet names currently supported +bool wxRichTextStdRenderer::EnumerateStandardBulletNames(wxArrayString& bulletNames) +{ + bulletNames.Add(wxT("standard/circle")); + bulletNames.Add(wxT("standard/square")); + bulletNames.Add(wxT("standard/diamond")); + bulletNames.Add(wxT("standard/triangle")); + + return true; +} /* * Module to initialise and clean up handlers @@ -5348,6 +5777,7 @@ public: wxRichTextModule() {} bool OnInit() { + wxRichTextBuffer::SetRenderer(new wxRichTextStdRenderer); wxRichTextBuffer::InitStandardHandlers(); wxRichTextParagraph::InitDefaultTabs(); return true; @@ -5358,6 +5788,7 @@ public: wxRichTextDecimalToRoman(-1); wxRichTextParagraph::ClearDefaultTabs(); wxRichTextCtrl::ClearAvailableFontNames(); + wxRichTextBuffer::SetRenderer(NULL); }; }; @@ -5460,6 +5891,57 @@ bool wxRichTextAction::Do() { case wxRICHTEXT_INSERT: { + // Store a list of line start character and y positions so we can figure out which area + // we need to refresh + wxArrayInt optimizationLineCharPositions; + wxArrayInt optimizationLineYPositions; + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + // NOTE: we're assuming that the buffer is laid out correctly at this point. + // If we had several actions, which only invalidate and leave layout until the + // paint handler is called, then this might not be true. So we may need to switch + // optimisation on only when we're simply adding text and not simultaneously + // deleting a selection, for example. Or, we make sure the buffer is laid out correctly + // first, but of course this means we'll be doing it twice. + if (!m_buffer->GetDirty() && m_ctrl) // can only do optimisation if the buffer is already laid out correctly + { + wxSize clientSize = m_ctrl->GetClientSize(); + wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint(); + int lastY = firstVisiblePt.y + clientSize.y; + + wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetPosition()); + wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para); + while (node) + { + wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData(); + wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* line = node2->GetData(); + wxPoint pt = line->GetAbsolutePosition(); + wxRichTextRange range = line->GetAbsoluteRange(); + + if (pt.y > lastY) + { + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); + } + else if (range.GetStart() > GetPosition() && pt.y >= firstVisiblePt.y) + { + optimizationLineCharPositions.Add(range.GetStart()); + optimizationLineYPositions.Add(pt.y); + } + + if (node2) + node2 = node2->GetNext(); + } + + if (node) + node = node->GetNext(); + } + } +#endif + m_buffer->InsertFragment(GetPosition(), m_newParagraphs); m_buffer->UpdateRanges(); m_buffer->Invalidate(GetRange()); @@ -5474,8 +5956,12 @@ bool wxRichTextAction::Do() newCaretPosition --; newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1)); + - UpdateAppearance(newCaretPosition, true /* send update event */); + if (optimizationLineCharPositions.GetCount() > 0) + UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions); + else + UpdateAppearance(newCaretPosition, true /* send update event */); break; } @@ -5520,7 +6006,7 @@ bool wxRichTextAction::Undo() long newCaretPosition = GetPosition() - 1; // if (m_newParagraphs.GetPartialParagraph()) // newCaretPosition --; - + UpdateAppearance(newCaretPosition, true /* send update event */); break; @@ -5552,7 +6038,7 @@ bool wxRichTextAction::Undo() } /// Update the control appearance -void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent) +void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* optimizationLineCharPositions, wxArrayInt* optimizationLineYPositions) { if (m_ctrl) { @@ -5561,7 +6047,99 @@ void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent { m_ctrl->LayoutContent(); m_ctrl->PositionCaret(); - m_ctrl->Refresh(false); + +#if wxRICHTEXT_USE_OPTIMIZED_DRAWING + // Find refresh rectangle if we are in a position to optimise refresh + if (m_cmdId == wxRICHTEXT_INSERT && optimizationLineCharPositions && optimizationLineCharPositions->GetCount() > 0) + { + size_t i; + + wxSize clientSize = m_ctrl->GetClientSize(); + wxPoint firstVisiblePt = m_ctrl->GetFirstVisiblePoint(); + + // Start/end positions + int firstY = 0; + int lastY = firstVisiblePt.y + clientSize.y; + + bool foundStart = false; + bool foundEnd = false; + + // position offset - how many characters were inserted + int positionOffset = GetRange().GetLength(); + + // find the first line which is being drawn at the same position as it was + // before. Since we're talking about a simple insertion, we can assume + // that the rest of the window does not need to be redrawn. + + wxRichTextParagraph* para = m_buffer->GetParagraphAtPosition(GetPosition()); + wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para); + while (node) + { + wxRichTextParagraph* child = (wxRichTextParagraph*) node->GetData(); + wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst(); + while (node2) + { + wxRichTextLine* line = node2->GetData(); + wxPoint pt = line->GetAbsolutePosition(); + wxRichTextRange range = line->GetAbsoluteRange(); + + // we want to find the first line that is in the same position + // as before. This will mean we're at the end of the changed text. + + if (pt.y > lastY) // going past the end of the window, no more info + { + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); + } + else + { + if (!foundStart) + { + firstY = pt.y - firstVisiblePt.y; + foundStart = true; + } + + // search for this line being at the same position as before + for (i = 0; i < optimizationLineCharPositions->GetCount(); i++) + { + if (((*optimizationLineCharPositions)[i] + positionOffset == range.GetStart()) && + ((*optimizationLineYPositions)[i] == pt.y)) + { + // Stop, we're now the same as we were + foundEnd = true; + lastY = pt.y - firstVisiblePt.y; + + node2 = wxRichTextLineList::compatibility_iterator(); + node = wxRichTextObjectList::compatibility_iterator(); + + break; + } + } + } + + if (node2) + node2 = node2->GetNext(); + } + + if (node) + node = node->GetNext(); + } + + if (!foundStart) + firstY = firstVisiblePt.y; + if (!foundEnd) + lastY = firstVisiblePt.y + clientSize.y; + + wxRect rect(firstVisiblePt.x, firstY, firstVisiblePt.x + clientSize.x, lastY - firstY); + m_ctrl->RefreshRect(rect); + + // TODO: we need to make sure that lines are only drawn if in the update region. The rect + // passed to Draw is currently used in different ways (to pass the position the content should + // be drawn at as well as the relevant region). + } + else +#endif + m_ctrl->Refresh(false); if (sendUpdateEvent) m_ctrl->SendTextUpdatedEvent(); @@ -5626,17 +6204,21 @@ bool wxRichTextRange::LimitTo(const wxRichTextRange& range) IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject) -wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent): +wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxTextAttrEx* charStyle): wxRichTextObject(parent) { m_image = image; + if (charStyle) + SetAttributes(*charStyle); } -wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent): +wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent, wxTextAttrEx* charStyle): wxRichTextObject(parent) { m_imageBlock = imageBlock; m_imageBlock.Load(m_image); + if (charStyle) + SetAttributes(*charStyle); } /// Load wxImage from the block @@ -5757,11 +6339,13 @@ bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2) attr1.GetParagraphSpacingBefore() == attr2.GetParagraphSpacingBefore() && attr1.GetBulletStyle() == attr2.GetBulletStyle() && attr1.GetBulletNumber() == attr2.GetBulletNumber() && - attr1.GetBulletSymbol() == attr2.GetBulletSymbol() && + attr1.GetBulletText() == attr2.GetBulletText() && + attr1.GetBulletName() == attr2.GetBulletName() && attr1.GetBulletFont() == attr2.GetBulletFont() && attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() && attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName() && - attr1.GetListStyleName() == attr2.GetListStyleName()); + attr1.GetListStyleName() == attr2.GetListStyleName() && + attr1.HasPageBreak() == attr2.HasPageBreak()); } /// Compare two attribute objects, but take into account the flags @@ -5837,18 +6421,23 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, i (attr1.GetBulletNumber() != attr2.GetBulletNumber())) return false; - if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletSymbol() != attr2.GetBulletSymbol())) + if ((flags & wxTEXT_ATTR_BULLET_TEXT) && + (attr1.GetBulletText() != attr2.GetBulletText()) && + (attr1.GetBulletFont() != attr2.GetBulletFont())) return false; - if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletFont() != attr2.GetBulletFont())) + if ((flags & wxTEXT_ATTR_BULLET_NAME) && + (attr1.GetBulletName() != attr2.GetBulletName())) return false; if ((flags & wxTEXT_ATTR_TABS) && !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs())) return false; + if ((flags & wxTEXT_ATTR_PAGE_BREAK) && + (attr1.HasPageBreak() != attr2.HasPageBreak())) + return false; + return true; } @@ -5926,18 +6515,23 @@ bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2, (attr1.GetBulletNumber() != attr2.GetBulletNumber())) return false; - if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletSymbol() != attr2.GetBulletSymbol())) + if ((flags & wxTEXT_ATTR_BULLET_TEXT) && + (attr1.GetBulletText() != attr2.GetBulletText()) && + (attr1.GetBulletFont() != attr2.GetBulletFont())) return false; - if ((flags & wxTEXT_ATTR_BULLET_SYMBOL) && - (attr1.GetBulletFont() != attr2.GetBulletFont())) + if ((flags & wxTEXT_ATTR_BULLET_NAME) && + (attr1.GetBulletName() != attr2.GetBulletName())) return false; if ((flags & wxTEXT_ATTR_TABS) && !wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs())) return false; + if ((flags & wxTEXT_ATTR_PAGE_BREAK) && + (attr1.HasPageBreak() != attr2.HasPageBreak())) + return false; + return true; } @@ -6044,15 +6638,26 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style) destStyle.SetListStyleName(style.GetListStyleName()); if (style.HasBulletStyle()) - { destStyle.SetBulletStyle(style.GetBulletStyle()); - destStyle.SetBulletSymbol(style.GetBulletSymbol()); + + if (style.HasBulletText()) + { + destStyle.SetBulletText(style.GetBulletText()); destStyle.SetBulletFont(style.GetBulletFont()); } + if (style.HasBulletName()) + destStyle.SetBulletName(style.GetBulletName()); + if (style.HasBulletNumber()) destStyle.SetBulletNumber(style.GetBulletNumber()); + if (style.HasURL()) + destStyle.SetURL(style.GetURL()); + + if (style.HasPageBreak()) + destStyle.SetPageBreak(); + return true; } @@ -6065,6 +6670,14 @@ bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style) return true; } +bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith) +{ + wxTextAttrEx attr(destStyle); + wxRichTextApplyStyle(attr, style, compareWith); + destStyle = attr; + return true; +} + bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith) { // Whole font. Avoiding setting individual attributes if possible, since @@ -6232,11 +6845,11 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style, destStyle.SetBulletStyle(style.GetBulletStyle()); } - if (style.HasBulletSymbol()) + if (style.HasBulletText()) { - if (!(compareWith && compareWith->HasBulletSymbol() && compareWith->GetBulletSymbol() == style.GetBulletSymbol())) + if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText())) { - destStyle.SetBulletSymbol(style.GetBulletSymbol()); + destStyle.SetBulletText(style.GetBulletText()); destStyle.SetBulletFont(style.GetBulletFont()); } } @@ -6247,6 +6860,38 @@ bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style, destStyle.SetBulletNumber(style.GetBulletNumber()); } + if (style.HasBulletName()) + { + if (!(compareWith && compareWith->HasBulletName() && compareWith->GetBulletName() == style.GetBulletName())) + destStyle.SetBulletName(style.GetBulletName()); + } + + if (style.HasURL()) + { + if (!(compareWith && compareWith->HasURL() && compareWith->GetURL() == style.GetURL())) + destStyle.SetURL(style.GetURL()); + } + + if (style.HasPageBreak()) + { + if (!(compareWith && compareWith->HasPageBreak())) + destStyle.SetPageBreak(); + } + + return true; +} + +/// Split into paragraph and character styles +bool wxRichTextSplitParaCharStyles(const wxTextAttrEx& style, wxTextAttrEx& parStyle, wxTextAttrEx& charStyle) +{ + wxTextAttrEx defaultCharStyle1(style); + wxTextAttrEx defaultParaStyle1(style); + defaultCharStyle1.SetFlags(defaultCharStyle1.GetFlags()&wxTEXT_ATTR_CHARACTER); + defaultParaStyle1.SetFlags(defaultParaStyle1.GetFlags()&wxTEXT_ATTR_PARAGRAPH); + + wxRichTextApplyStyle(charStyle, defaultCharStyle1); + wxRichTextApplyStyle(parStyle, defaultParaStyle1); + return true; } @@ -6310,7 +6955,6 @@ wxString wxRichTextDecimalToRoman(long n) return roman; } - /*! * wxRichTextAttr stores attributes without a wxFont object, so is a much more * efficient way to query styles. @@ -6336,6 +6980,11 @@ wxRichTextAttr::wxRichTextAttr(const wxTextAttrEx& attr) (*this) = attr; } +wxRichTextAttr::wxRichTextAttr(const wxRichTextAttr& attr) +{ + Copy(attr); +} + // operations void wxRichTextAttr::Init() { @@ -6355,11 +7004,10 @@ void wxRichTextAttr::Init() m_lineSpacing = 0; m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE; m_bulletNumber = 0; - m_bulletSymbol = wxT('*'); } -// operators -void wxRichTextAttr::operator= (const wxRichTextAttr& attr) +// Copy +void wxRichTextAttr::Copy(const wxRichTextAttr& attr) { m_colText = attr.m_colText; m_colBack = attr.m_colBack; @@ -6384,8 +7032,17 @@ void wxRichTextAttr::operator= (const wxRichTextAttr& attr) m_listStyleName = attr.m_listStyleName; m_bulletStyle = attr.m_bulletStyle; m_bulletNumber = attr.m_bulletNumber; - m_bulletSymbol = attr.m_bulletSymbol; + m_bulletText = attr.m_bulletText; m_bulletFont = attr.m_bulletFont; + m_bulletName = attr.m_bulletName; + + m_urlTarget = attr.m_urlTarget; +} + +// operators +void wxRichTextAttr::operator= (const wxRichTextAttr& attr) +{ + Copy(attr); } // operators @@ -6408,9 +7065,12 @@ void wxRichTextAttr::operator= (const wxTextAttrEx& attr) m_listStyleName = attr.GetListStyleName(); m_bulletStyle = attr.GetBulletStyle(); m_bulletNumber = attr.GetBulletNumber(); - m_bulletSymbol = attr.GetBulletSymbol(); + m_bulletText = attr.GetBulletText(); + m_bulletName = attr.GetBulletName(); m_bulletFont = attr.GetBulletFont(); + m_urlTarget = attr.GetURL(); + if (attr.GetFont().Ok()) GetFontAttributes(attr.GetFont()); } @@ -6445,15 +7105,18 @@ bool wxRichTextAttr::operator== (const wxRichTextAttr& attr) const GetListStyleName() == attr.GetListStyleName() && GetBulletStyle() == attr.GetBulletStyle() && - GetBulletSymbol() == attr.GetBulletSymbol() && + GetBulletText() == attr.GetBulletText() && GetBulletNumber() == attr.GetBulletNumber() && GetBulletFont() == attr.GetBulletFont() && + GetBulletName() == attr.GetBulletName() && m_fontSize == attr.m_fontSize && m_fontStyle == attr.m_fontStyle && m_fontWeight == attr.m_fontWeight && m_fontUnderlined == attr.m_fontUnderlined && - m_fontFaceName == attr.m_fontFaceName; + m_fontFaceName == attr.m_fontFaceName && + + m_urlTarget == attr.m_urlTarget; } // Copy to a wxTextAttr @@ -6472,12 +7135,15 @@ void wxRichTextAttr::CopyTo(wxTextAttrEx& attr) const attr.SetLineSpacing(m_lineSpacing); attr.SetBulletStyle(m_bulletStyle); attr.SetBulletNumber(m_bulletNumber); - attr.SetBulletSymbol(m_bulletSymbol); + attr.SetBulletText(m_bulletText); + attr.SetBulletName(m_bulletName); attr.SetBulletFont(m_bulletFont); attr.SetCharacterStyleName(m_characterStyleName); attr.SetParagraphStyleName(m_paragraphStyleName); attr.SetListStyleName(m_listStyleName); + attr.SetURL(m_urlTarget); + attr.SetFlags(GetFlags()); // Important: set after SetFont and others, since they set flags } @@ -6591,12 +7257,21 @@ wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& attr, if (attr.HasBulletNumber()) newAttr.SetBulletNumber(attr.GetBulletNumber()); - if (attr.HasBulletSymbol()) + if (attr.HasBulletName()) + newAttr.SetBulletName(attr.GetBulletName()); + + if (attr.HasBulletText()) { - newAttr.SetBulletSymbol(attr.GetBulletSymbol()); + newAttr.SetBulletText(attr.GetBulletText()); newAttr.SetBulletFont(attr.GetBulletFont()); } + if (attr.HasURL()) + newAttr.SetURL(attr.GetURL()); + + if (attr.HasPageBreak()) + newAttr.SetPageBreak(); + return newAttr; } @@ -6604,18 +7279,9 @@ wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& attr, * wxTextAttrEx is an extended version of wxTextAttr with more paragraph attributes. */ -wxTextAttrEx::wxTextAttrEx(const wxTextAttrEx& attr): wxTextAttr(attr) +wxTextAttrEx::wxTextAttrEx(const wxTextAttrEx& attr): wxTextAttr() { - m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter; - m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore; - m_lineSpacing = attr.m_lineSpacing; - m_paragraphStyleName = attr.m_paragraphStyleName; - m_characterStyleName = attr.m_characterStyleName; - m_listStyleName = attr.m_listStyleName; - m_bulletStyle = attr.m_bulletStyle; - m_bulletNumber = attr.m_bulletNumber; - m_bulletSymbol = attr.m_bulletSymbol; - m_bulletFont = attr.m_bulletFont; + Copy(attr); } // Initialise this object. @@ -6626,12 +7292,10 @@ void wxTextAttrEx::Init() m_lineSpacing = 0; m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE; m_bulletNumber = 0; - m_bulletSymbol = 0; - m_bulletSymbol = wxT('*'); } -// Assignment from a wxTextAttrEx object -void wxTextAttrEx::operator= (const wxTextAttrEx& attr) +// Copy +void wxTextAttrEx::Copy(const wxTextAttrEx& attr) { wxTextAttr::operator= (attr); @@ -6643,8 +7307,16 @@ void wxTextAttrEx::operator= (const wxTextAttrEx& attr) m_listStyleName = attr.m_listStyleName; m_bulletStyle = attr.m_bulletStyle; m_bulletNumber = attr.m_bulletNumber; - m_bulletSymbol = attr.m_bulletSymbol; + m_bulletText = attr.m_bulletText; m_bulletFont = attr.m_bulletFont; + m_bulletName = attr.m_bulletName; + m_urlTarget = attr.m_urlTarget; +} + +// Assignment from a wxTextAttrEx object +void wxTextAttrEx::operator= (const wxTextAttrEx& attr) +{ + Copy(attr); } // Assignment from a wxTextAttr object. @@ -6670,11 +7342,13 @@ bool wxTextAttrEx::operator== (const wxTextAttrEx& attr) const GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() && GetBulletStyle() == attr.GetBulletStyle() && GetBulletNumber() == attr.GetBulletNumber() && - GetBulletSymbol() == attr.GetBulletSymbol() && + GetBulletText() == attr.GetBulletText() && + GetBulletName() == attr.GetBulletName() && GetBulletFont() == attr.GetBulletFont() && GetCharacterStyleName() == attr.GetCharacterStyleName() && GetParagraphStyleName() == attr.GetParagraphStyleName() && - GetListStyleName() == attr.GetListStyleName()); + GetListStyleName() == attr.GetListStyleName() && + GetURL() == attr.GetURL()); } wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr, @@ -6813,12 +7487,18 @@ wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr, if (attr.HasBulletNumber()) newAttr.SetBulletNumber(attr.GetBulletNumber()); - if (attr.HasBulletSymbol()) + if (attr.HasBulletName()) + newAttr.SetBulletName(attr.GetBulletName()); + + if (attr.HasBulletText()) { - newAttr.SetBulletSymbol(attr.GetBulletSymbol()); + newAttr.SetBulletText(attr.GetBulletText()); newAttr.SetBulletFont(attr.GetBulletFont()); } + if (attr.HasURL()) + newAttr.SetURL(attr.GetURL()); + return newAttr; } @@ -7176,6 +7856,16 @@ bool wxRichTextImageBlock::WriteBlock(const wxString& filename, unsigned char* b return WriteBlock(outStream, block, size); } +// Gets the extension for the block's type +wxString wxRichTextImageBlock::GetExtension() const +{ + wxImageHandler* handler = wxImage::FindHandler(GetImageType()); + if (handler) + return handler->GetExtension(); + else + return wxEmptyString; +} + #if wxUSE_DATAOBJ /*! @@ -7296,4 +7986,3 @@ bool wxRichTextBufferDataObject::SetData(size_t WXUNUSED(len), const void *buf) #endif // wxUSE_RICHTEXT -