#include "wx/module.h"
#endif
+#include "wx/settings.h"
#include "wx/filename.h"
#include "wx/clipbrd.h"
#include "wx/wfstream.h"
#include "wx/mstream.h"
#include "wx/sstream.h"
#include "wx/textfile.h"
+#include "wx/hashmap.h"
#include "wx/richtext/richtextctrl.h"
#include "wx/richtext/richtextstyles.h"
// Switch off if the platform doesn't like it for some reason
#define wxRICHTEXT_USE_OPTIMIZED_DRAWING 1
+// Use GetPartialTextExtents for platforms that support it natively
+#define wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS 1
+
const wxChar wxRichTextLineBreakChar = (wxChar) 29;
+// Helpers for efficiency
+
+inline void wxCheckSetFont(wxDC& dc, const wxFont& font)
+{
+ const wxFont& font1 = dc.GetFont();
+ if (font1.IsOk() && font.IsOk())
+ {
+ if (font1.GetPointSize() == font.GetPointSize() &&
+ font1.GetFamily() == font.GetFamily() &&
+ font1.GetStyle() == font.GetStyle() &&
+ font1.GetWeight() == font.GetWeight() &&
+ font1.GetUnderlined() == font.GetUnderlined() &&
+ font1.GetFaceName() == font.GetFaceName())
+ return;
+ }
+ dc.SetFont(font);
+}
+
+inline void wxCheckSetPen(wxDC& dc, const wxPen& pen)
+{
+ const wxPen& pen1 = dc.GetPen();
+ if (pen1.IsOk() && pen.IsOk())
+ {
+ if (pen1.GetWidth() == pen.GetWidth() &&
+ pen1.GetStyle() == pen.GetStyle() &&
+ pen1.GetColour() == pen.GetColour())
+ return;
+ }
+ dc.SetPen(pen);
+}
+
+inline void wxCheckSetBrush(wxDC& dc, const wxBrush& brush)
+{
+ const wxBrush& brush1 = dc.GetBrush();
+ if (brush1.IsOk() && brush.IsOk())
+ {
+ if (brush1.GetStyle() == brush.GetStyle() &&
+ brush1.GetColour() == brush.GetColour())
+ return;
+ }
+ dc.SetBrush(brush);
+}
+
/*!
* wxRichTextObject
* This is the base for drawable objects.
node = node->GetNext();
}
- return wxRICHTEXT_HITTEST_NONE;
+ textPosition = GetRange().GetEnd()-1;
+ return wxRICHTEXT_HITTEST_AFTER|wxRICHTEXT_HITTEST_OUTSIDE;
}
/// Finds the absolute position and row height for the given character position
}
/// Recursively merge all pieces that can be merged.
-bool wxRichTextCompositeObject::Defragment()
+bool wxRichTextCompositeObject::Defragment(const wxRichTextRange& range)
{
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxRichTextObject* child = node->GetData();
- wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject);
- if (composite)
- composite->Defragment();
-
- if (node->GetNext())
+ if (!child->GetRange().IsOutside(range))
{
- wxRichTextObject* nextChild = node->GetNext()->GetData();
- if (child->CanMerge(nextChild) && child->Merge(nextChild))
+ wxRichTextCompositeObject* composite = wxDynamicCast(child, wxRichTextCompositeObject);
+ if (composite)
+ composite->Defragment();
+
+ if (node->GetNext())
{
- nextChild->Dereference();
- m_children.Erase(node->GetNext());
+ wxRichTextObject* nextChild = node->GetNext()->GetData();
+ if (child->CanMerge(nextChild) && child->Merge(nextChild))
+ {
+ nextChild->Dereference();
+ m_children.Erase(node->GetNext());
- // Don't set node -- we'll see if we can merge again with the next
- // child.
+ // Don't set node -- we'll see if we can merge again with the next
+ // child.
+ }
+ else
+ node = node->GetNext();
}
else
node = node->GetNext();
}
/// Get/set the size for the given range. Assume only has one child.
-bool wxRichTextBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position) const
+bool wxRichTextBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* partialExtents) const
{
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
if (node)
{
wxRichTextObject* child = node->GetData();
- return child->GetRangeSize(range, size, descent, dc, flags, position);
+ return child->GetRangeSize(range, size, descent, dc, flags, position, partialExtents);
}
else
return false;
// Skip
}
else
- child->Draw(dc, range, selectionRange, childRect, descent, style);
+ child->Draw(dc, range, selectionRange, rect, descent, style);
}
node = node->GetNext();
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())
+ if (invalidRange.GetStart() >= GetRange().GetStart())
{
wxRichTextParagraph* firstParagraph = GetParagraphAtPosition(invalidRange.GetStart());
if (firstParagraph)
wxRichTextObjectList::compatibility_iterator previousNode;
if ( firstNode )
previousNode = firstNode->GetPrevious();
- if (firstNode && previousNode)
+ if (firstNode)
{
- wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph);
- availableSpace.y = previousParagraph->GetPosition().y + previousParagraph->GetCachedSize().y;
+ if (previousNode)
+ {
+ wxRichTextParagraph* previousParagraph = wxDynamicCast(previousNode->GetData(), wxRichTextParagraph);
+ availableSpace.y = previousParagraph->GetPosition().y + previousParagraph->GetCachedSize().y;
+ }
// Now we're going to start iterating from the first affected paragraph.
node = firstNode;
wxRichTextBox::Copy(obj);
m_partialParagraph = obj.m_partialParagraph;
+ m_defaultAttributes = obj.m_defaultAttributes;
}
/// Get/set the size for the given range.
-bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position) const
+bool wxRichTextParagraphLayoutBox::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* WXUNUSED(partialExtents)) const
{
wxSize sz;
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
- // child is a paragraph
- wxRichTextParagraph* child = wxDynamicCast(node->GetData(), wxRichTextParagraph);
- wxASSERT (child != NULL);
-
- wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
- while (node2)
+ wxRichTextObject* obj = (wxRichTextObject*) node->GetData();
+ if (obj->GetRange().Contains(pos))
{
- wxRichTextLine* line = node2->GetData();
+ // child is a paragraph
+ wxRichTextParagraph* child = wxDynamicCast(obj, wxRichTextParagraph);
+ wxASSERT (child != NULL);
- wxRichTextRange range = line->GetAbsoluteRange();
+ wxRichTextLineList::compatibility_iterator node2 = child->GetLines().GetFirst();
+ while (node2)
+ {
+ wxRichTextLine* line = node2->GetData();
- if (range.Contains(pos) ||
+ wxRichTextRange range = line->GetAbsoluteRange();
- // If the position is end-of-paragraph, then return the last line of
- // of the paragraph.
- (range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd()))
- return line;
+ if (range.Contains(pos) ||
- node2 = node2->GetNext();
+ // If the position is end-of-paragraph, then return the last line of
+ // of the paragraph.
+ ((range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())))
+ return line;
+
+ node2 = node2->GetNext();
+ }
}
node = node->GetNext();
/// Convenience function to add a paragraph of text
-wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxTextAttrEx* paraStyle)
+wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraph(const wxString& text, wxTextAttr* paraStyle)
{
// Don't use the base style, just the default style, and the base style will
// be combined at display time.
// Divide into paragraph and character styles.
- wxTextAttrEx defaultCharStyle;
- wxTextAttrEx defaultParaStyle;
+ wxTextAttr defaultCharStyle;
+ wxTextAttr defaultParaStyle;
+
+ // If the default style is a named paragraph style, don't apply any character formatting
+ // to the initial text string.
+ if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet())
+ {
+ wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName());
+ if (def)
+ defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet());
+ }
+ else
+ wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
- wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
- wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
- wxTextAttrEx* cStyle = & defaultCharStyle;
+ wxTextAttr* pStyle = paraStyle ? paraStyle : (wxTextAttr*) & defaultParaStyle;
+ wxTextAttr* cStyle = & defaultCharStyle;
wxRichTextParagraph* para = new wxRichTextParagraph(text, this, pStyle, cStyle);
}
/// Adds multiple paragraphs, based on newlines.
-wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxTextAttrEx* paraStyle)
+wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text, wxTextAttr* paraStyle)
{
// Don't use the base style, just the default style, and the base style will
// be combined at display time.
// Divide into paragraph and character styles.
- wxTextAttrEx defaultCharStyle;
- wxTextAttrEx defaultParaStyle;
- wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
+ wxTextAttr defaultCharStyle;
+ wxTextAttr defaultParaStyle;
+
+ // If the default style is a named paragraph style, don't apply any character formatting
+ // to the initial text string.
+ if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet())
+ {
+ wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName());
+ if (def)
+ defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet());
+ }
+ else
+ wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
- wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
- wxTextAttrEx* cStyle = & defaultCharStyle;
+ wxTextAttr* pStyle = paraStyle ? paraStyle : (wxTextAttr*) & defaultParaStyle;
+ wxTextAttr* cStyle = & defaultCharStyle;
wxRichTextParagraph* firstPara = NULL;
wxRichTextParagraph* lastPara = NULL;
wxChar ch = text[i];
if (ch == wxT('\n') || ch == wxT('\r'))
{
- wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData();
- plainText->SetText(line);
+ if (i != (len-1))
+ {
+ wxRichTextPlainText* plainText = (wxRichTextPlainText*) para->GetChildren().GetFirst()->GetData();
+ plainText->SetText(line);
- para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);
+ para = new wxRichTextParagraph(wxEmptyString, this, pStyle, cStyle);
- AppendChild(para);
+ AppendChild(para);
- lastPara = para;
- line = wxEmptyString;
+ lastPara = para;
+ line = wxEmptyString;
+ }
}
else
line += ch;
}
/// Convenience function to add an image
-wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxTextAttrEx* paraStyle)
+wxRichTextRange wxRichTextParagraphLayoutBox::AddImage(const wxImage& image, wxTextAttr* paraStyle)
{
// Don't use the base style, just the default style, and the base style will
// be combined at display time.
// Divide into paragraph and character styles.
- wxTextAttrEx defaultCharStyle;
- wxTextAttrEx defaultParaStyle;
- wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
+ wxTextAttr defaultCharStyle;
+ wxTextAttr defaultParaStyle;
+
+ // If the default style is a named paragraph style, don't apply any character formatting
+ // to the initial text string.
+ if (GetDefaultStyle().HasParagraphStyleName() && GetStyleSheet())
+ {
+ wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(GetDefaultStyle().GetParagraphStyleName());
+ if (def)
+ defaultParaStyle = def->GetStyleMergedWithBase(GetStyleSheet());
+ }
+ else
+ wxRichTextSplitParaCharStyles(GetDefaultStyle(), defaultParaStyle, defaultCharStyle);
- wxTextAttrEx* pStyle = paraStyle ? paraStyle : (wxTextAttrEx*) & defaultParaStyle;
- wxTextAttrEx* cStyle = & defaultCharStyle;
+ wxTextAttr* pStyle = paraStyle ? paraStyle : (wxTextAttr*) & defaultParaStyle;
+ wxTextAttr* cStyle = & defaultCharStyle;
wxRichTextParagraph* para = new wxRichTextParagraph(this, pStyle);
AppendChild(para);
wxRichTextParagraph* para = GetParagraphAtPosition(position);
if (para)
{
+ wxTextAttrEx originalAttr = para->GetAttributes();
+
wxRichTextObjectList::compatibility_iterator node = m_children.Find(para);
// Now split at this position, returning the object to insert the new
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)
{
wxRichTextParagraph* firstPara = wxDynamicCast(firstParaNode->GetData(), wxRichTextParagraph);
wxASSERT(firstPara != NULL);
+ if (!(fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE))
+ para->SetAttributes(firstPara->GetAttributes());
+
+ // Save empty paragraph attributes for appending later
+ // These are character attributes deliberately set for a new paragraph. Without this,
+ // we couldn't pass default attributes when appending a new paragraph.
+ wxTextAttrEx emptyParagraphAttributes;
+
wxRichTextObjectList::compatibility_iterator objectNode = firstPara->GetChildren().GetFirst();
+
+ if (objectNode && firstPara->GetChildren().GetCount() == 1 && objectNode->GetData()->IsEmpty())
+ emptyParagraphAttributes = objectNode->GetData()->GetAttributes();
+
while (objectNode)
{
wxRichTextObject* newObj = objectNode->GetData()->Clone();
wxRichTextObjectList::compatibility_iterator i = fragment.GetChildren().GetFirst()->GetNext();
wxRichTextParagraph* finalPara = para;
+ bool needExtraPara = (!i || !fragment.GetPartialParagraph());
+
// If there was only one paragraph, we need to insert a new one.
- if (!i)
+ while (i)
{
- finalPara = new wxRichTextParagraph;
+ wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
+ wxASSERT( para != NULL );
- // TODO: These attributes should come from the subsequent paragraph
- // when originally deleted, since the subsequent para takes on
- // the previous para's attributes.
- finalPara->SetAttributes(firstPara->GetAttributes());
+ finalPara = (wxRichTextParagraph*) para->Clone();
if (nextParagraph)
InsertChild(finalPara, nextParagraph);
else
AppendChild(finalPara);
+
+ i = i->GetNext();
}
- else while (i)
- {
- wxRichTextParagraph* para = wxDynamicCast(i->GetData(), wxRichTextParagraph);
- wxASSERT( para != NULL );
- finalPara = (wxRichTextParagraph*) para->Clone();
+ // If there was only one paragraph, or we have full paragraphs in our fragment,
+ // we need to insert a new one.
+ if (needExtraPara)
+ {
+ finalPara = new wxRichTextParagraph;
if (nextParagraph)
InsertChild(finalPara, nextParagraph);
else
AppendChild(finalPara);
-
- i = i->GetNext();
}
// 4. Add back the remaining content.
if (finalPara)
{
- finalPara->MoveFromList(savedObjects);
+ if (nextObject)
+ finalPara->MoveFromList(savedObjects);
// Ensure there's at least one object
if (finalPara->GetChildCount() == 0)
{
wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString);
+ text->SetAttributes(emptyParagraphAttributes);
finalPara->AppendChild(text);
}
}
+ if ((fragment.GetAttributes().GetFlags() & wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE) && firstPara)
+ finalPara->SetAttributes(firstPara->GetAttributes());
+ else if (finalPara && finalPara != para)
+ finalPara->SetAttributes(originalAttr);
+
return true;
}
}
{
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+ wxRichTextParagraph* firstPara = NULL;
while (node)
{
wxRichTextParagraph* obj = wxDynamicCast(node->GetData(), wxRichTextParagraph);
// Deletes the content of this object within the given range
obj->DeleteRange(range);
+ wxRichTextRange thisRange = obj->GetRange();
+ wxTextAttrEx thisAttr = obj->GetAttributes();
+
// If the whole paragraph is within the range to delete,
// delete the whole thing.
- if (range.GetStart() <= obj->GetRange().GetStart() && range.GetEnd() >= obj->GetRange().GetEnd())
+ if (range.GetStart() <= thisRange.GetStart() && range.GetEnd() >= thisRange.GetEnd())
{
// Delete the whole object
RemoveChild(obj, true);
+ obj = NULL;
}
+ else if (!firstPara)
+ firstPara = obj;
+
// If the range includes the paragraph end, we need to join this
// and the next paragraph.
- else if (range.Contains(obj->GetRange().GetEnd()))
+ if (range.GetEnd() <= thisRange.GetEnd())
{
// We need to move the objects from the next paragraph
// to this paragraph
- if (next)
+ wxRichTextParagraph* nextParagraph = NULL;
+ if ((range.GetEnd() < thisRange.GetEnd()) && obj)
+ nextParagraph = obj;
+ else
{
- wxRichTextParagraph* nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph);
- next = next->GetNext();
- if (nextParagraph)
- {
- // Delete the stuff we need to delete
- nextParagraph->DeleteRange(range);
+ // We're ending at the end of the paragraph, so merge the _next_ paragraph.
+ if (next)
+ nextParagraph = wxDynamicCast(next->GetData(), wxRichTextParagraph);
+ }
- // Move the objects to the previous para
- wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst();
+ bool applyFinalParagraphStyle = firstPara && nextParagraph && nextParagraph != firstPara;
- while (node1)
- {
- wxRichTextObject* obj1 = node1->GetData();
+ wxTextAttrEx nextParaAttr;
+ if (applyFinalParagraphStyle)
+ {
+ // Special case when deleting the end of a paragraph - use _this_ paragraph's style,
+ // not the next one.
+ if (range.GetStart() == range.GetEnd() && range.GetStart() == thisRange.GetEnd())
+ nextParaAttr = thisAttr;
+ else
+ nextParaAttr = nextParagraph->GetAttributes();
+ }
- // If the object is empty, optimise it out
- if (obj1->IsEmpty())
- {
- delete obj1;
- }
- else
- {
- obj->AppendChild(obj1);
- }
+ if (firstPara && nextParagraph && firstPara != nextParagraph)
+ {
+ // Move the objects to the previous para
+ wxRichTextObjectList::compatibility_iterator node1 = nextParagraph->GetChildren().GetFirst();
- wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();
- nextParagraph->GetChildren().Erase(node1);
+ while (node1)
+ {
+ wxRichTextObject* obj1 = node1->GetData();
- node1 = next1;
- }
+ firstPara->AppendChild(obj1);
- // Delete the paragraph
- RemoveChild(nextParagraph, true);
+ wxRichTextObjectList::compatibility_iterator next1 = node1->GetNext();
+ nextParagraph->GetChildren().Erase(node1);
+ node1 = next1;
}
+
+ // Delete the paragraph
+ RemoveChild(nextParagraph, true);
+ }
+
+ // Avoid empty paragraphs
+ if (firstPara && firstPara->GetChildren().GetCount() == 0)
+ {
+ wxRichTextPlainText* text = new wxRichTextPlainText(wxEmptyString);
+ firstPara->AppendChild(text);
}
+ if (applyFinalParagraphStyle)
+ firstPara->SetAttributes(nextParaAttr);
+
+ return true;
}
}
wxRichTextObject* child = node->GetData();
if (!child->GetRange().IsOutside(range))
{
-// if (lineCount > 0)
-// text += wxT("\n");
wxRichTextRange childRange = range;
childRange.LimitTo(child->GetRange());
text += childText;
- if (childRange.GetEnd() == child->GetRange().GetEnd())
+ if ((childRange.GetEnd() == child->GetRange().GetEnd()) && node->GetNext())
text += wxT("\n");
lineCount ++;
}
/// Set character or paragraph text attributes: apply character styles only to immediate text nodes
-bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style, int flags)
+bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxTextAttr& style, int flags)
{
bool characterStyle = false;
bool paragraphStyle = false;
bool removeStyle = ((flags & wxRICHTEXT_SETSTYLE_REMOVE) != 0);
// Apply paragraph style first, if any
- wxRichTextAttr wholeStyle(style);
+ wxTextAttr wholeStyle(style);
if (!removeStyle && wholeStyle.HasParagraphStyleName() && GetStyleSheet())
{
}
// Limit the attributes to be set to the content to only character attributes.
- wxRichTextAttr characterAttributes(wholeStyle);
+ wxTextAttr characterAttributes(wholeStyle);
characterAttributes.SetFlags(characterAttributes.GetFlags() & (wxTEXT_ATTR_CHARACTER));
if (!removeStyle && characterAttributes.HasCharacterStyleName() && GetStyleSheet())
{
// Only apply attributes that will make a difference to the combined
// style as seen on the display
- wxRichTextAttr combinedAttr(para->GetCombinedAttributes());
+ wxTextAttr combinedAttr(para->GetCombinedAttributes());
wxRichTextApplyStyle(newPara->GetAttributes(), wholeStyle, & combinedAttr);
}
else
// we only want the paragraphs to hold this character style, then we _don't_ want to
// apply the character style. So we need to be able to choose.
- // if (!paragraphStyle && characterStyle && range.GetStart() != newPara->GetRange().GetEnd())
- if (!parasOnly && characterStyle && range.GetStart() != newPara->GetRange().GetEnd())
+ if (!parasOnly && (characterStyle|charactersOnly) && range.GetStart() != newPara->GetRange().GetEnd())
{
wxRichTextRange childRange(range);
childRange.LimitTo(newPara->GetRange());
splitPoint ++;
// Find last object
- if (splitPoint == newPara->GetRange().GetEnd() || splitPoint == (newPara->GetRange().GetEnd() - 1))
+ if (splitPoint == newPara->GetRange().GetEnd())
lastObject = newPara->GetChildren().GetLast()->GetData();
else
// lastObject is set as a side-effect of splitting. It's
{
// Only apply attributes that will make a difference to the combined
// style as seen on the display
- wxRichTextAttr combinedAttr(newPara->GetCombinedAttributes(child->GetAttributes()));
+ wxTextAttr combinedAttr(newPara->GetCombinedAttributes(child->GetAttributes()));
wxRichTextApplyStyle(child->GetAttributes(), characterAttributes, & combinedAttr);
}
else
return true;
}
-/// Set text attributes
-bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const wxTextAttrEx& style, int flags)
-{
- wxRichTextAttr richStyle = style;
- return SetStyle(range, richStyle, flags);
-}
-
/// Get the text attributes for this position.
-bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttrEx& style)
+bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxTextAttr& style)
{
return DoGetStyle(position, style, true);
}
-/// Get the text attributes for this position.
-bool wxRichTextParagraphLayoutBox::GetStyle(long position, wxRichTextAttr& style)
-{
- wxTextAttrEx textAttrEx(style);
- if (GetStyle(position, textAttrEx))
- {
- style = textAttrEx;
- return true;
- }
- else
- return false;
-}
-
-/// Get the content (uncombined) attributes for this position.
-bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxTextAttrEx& style)
+bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxTextAttr& style)
{
return DoGetStyle(position, style, false);
}
-bool wxRichTextParagraphLayoutBox::GetUncombinedStyle(long position, wxRichTextAttr& style)
-{
- wxTextAttrEx textAttrEx(style);
- if (GetUncombinedStyle(position, textAttrEx))
- {
- style = textAttrEx;
- return true;
- }
- else
- return false;
-}
-
/// Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and
/// context attributes.
-bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttrEx& style, bool combineStyles)
+bool wxRichTextParagraphLayoutBox::DoGetStyle(long position, wxTextAttr& style, bool combineStyles)
{
wxRichTextObject* obj wxDUMMY_INITIALIZE(NULL);
/// Combines 'style' with 'currentStyle' for the purpose of summarising the attributes of a range of
/// content.
-bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttrEx& currentStyle, const wxTextAttrEx& style, long& multipleStyleAttributes, int& multipleTextEffectAttributes)
+bool wxRichTextParagraphLayoutBox::CollectStyle(wxTextAttr& currentStyle, const wxTextAttr& style, long& multipleStyleAttributes, int& multipleTextEffectAttributes, int& absentStyleAttributes, int& absentTextEffectAttributes)
{
+ absentStyleAttributes |= (~style.GetFlags() & wxTEXT_ATTR_ALL);
+ absentTextEffectAttributes |= (~style.GetTextEffectFlags() & 0xFFFF);
+
if (style.HasFont())
{
- if (style.HasFontSize() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_SIZE))
+ if (style.HasFontSize() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_FONT_SIZE))
{
- if (currentStyle.GetFont().Ok() && currentStyle.HasFontSize())
+ if (currentStyle.HasFontSize())
{
- if (currentStyle.GetFont().GetPointSize() != style.GetFont().GetPointSize())
+ if (currentStyle.GetFontSize() != style.GetFontSize())
{
// Clash of style - mark as such
multipleStyleAttributes |= wxTEXT_ATTR_FONT_SIZE;
}
else
{
- if (!currentStyle.GetFont().Ok())
- wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
- wxFont font(currentStyle.GetFont());
- font.SetPointSize(style.GetFont().GetPointSize());
-
- wxSetFontPreservingStyles(currentStyle, font);
- currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);
+ currentStyle.SetFontSize(style.GetFontSize());
}
}
- if (style.HasFontItalic() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_ITALIC))
+ if (style.HasFontItalic() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_FONT_ITALIC))
{
- if (currentStyle.GetFont().Ok() && currentStyle.HasFontItalic())
+ if (currentStyle.HasFontItalic())
{
- if (currentStyle.GetFont().GetStyle() != style.GetFont().GetStyle())
+ if (currentStyle.GetFontStyle() != style.GetFontStyle())
{
// Clash of style - mark as such
multipleStyleAttributes |= wxTEXT_ATTR_FONT_ITALIC;
}
else
{
- if (!currentStyle.GetFont().Ok())
- wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
- wxFont font(currentStyle.GetFont());
- font.SetStyle(style.GetFont().GetStyle());
- wxSetFontPreservingStyles(currentStyle, font);
- currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC);
+ currentStyle.SetFontStyle(style.GetFontStyle());
}
}
- if (style.HasFontWeight() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_WEIGHT))
+ if (style.HasFontWeight() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_FONT_WEIGHT))
{
- if (currentStyle.GetFont().Ok() && currentStyle.HasFontWeight())
+ if (currentStyle.HasFontWeight())
{
- if (currentStyle.GetFont().GetWeight() != style.GetFont().GetWeight())
+ if (currentStyle.GetFontWeight() != style.GetFontWeight())
{
// Clash of style - mark as such
multipleStyleAttributes |= wxTEXT_ATTR_FONT_WEIGHT;
}
else
{
- if (!currentStyle.GetFont().Ok())
- wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
- wxFont font(currentStyle.GetFont());
- font.SetWeight(style.GetFont().GetWeight());
- wxSetFontPreservingStyles(currentStyle, font);
- currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);
+ currentStyle.SetFontWeight(style.GetFontWeight());
}
}
- if (style.HasFontFaceName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_FACE))
+ if (style.HasFontFaceName() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_FONT_FACE))
{
- if (currentStyle.GetFont().Ok() && currentStyle.HasFontFaceName())
+ if (currentStyle.HasFontFaceName())
{
- wxString faceName1(currentStyle.GetFont().GetFaceName());
- wxString faceName2(style.GetFont().GetFaceName());
+ wxString faceName1(currentStyle.GetFontFaceName());
+ wxString faceName2(style.GetFontFaceName());
if (faceName1 != faceName2)
{
}
else
{
- if (!currentStyle.GetFont().Ok())
- wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
- wxFont font(currentStyle.GetFont());
- font.SetFaceName(style.GetFont().GetFaceName());
- wxSetFontPreservingStyles(currentStyle, font);
- currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE);
+ currentStyle.SetFontFaceName(style.GetFontFaceName());
}
}
- if (style.HasFontUnderlined() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_FONT_UNDERLINE))
+ if (style.HasFontUnderlined() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_FONT_UNDERLINE))
{
- if (currentStyle.GetFont().Ok() && currentStyle.HasFontUnderlined())
+ if (currentStyle.HasFontUnderlined())
{
- if (currentStyle.GetFont().GetUnderlined() != style.GetFont().GetUnderlined())
+ if (currentStyle.GetFontUnderlined() != style.GetFontUnderlined())
{
// Clash of style - mark as such
multipleStyleAttributes |= wxTEXT_ATTR_FONT_UNDERLINE;
}
else
{
- if (!currentStyle.GetFont().Ok())
- wxSetFontPreservingStyles(currentStyle, *wxNORMAL_FONT);
- wxFont font(currentStyle.GetFont());
- font.SetUnderlined(style.GetFont().GetUnderlined());
- wxSetFontPreservingStyles(currentStyle, font);
- currentStyle.SetFlags(currentStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE);
+ currentStyle.SetFontUnderlined(style.GetFontUnderlined());
}
}
}
- if (style.HasTextColour() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_TEXT_COLOUR))
+ if (style.HasTextColour() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_TEXT_COLOUR))
{
if (currentStyle.HasTextColour())
{
currentStyle.SetTextColour(style.GetTextColour());
}
- if (style.HasBackgroundColour() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BACKGROUND_COLOUR))
+ if (style.HasBackgroundColour() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_BACKGROUND_COLOUR))
{
if (currentStyle.HasBackgroundColour())
{
currentStyle.SetBackgroundColour(style.GetBackgroundColour());
}
- if (style.HasAlignment() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_ALIGNMENT))
+ if (style.HasAlignment() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_ALIGNMENT))
{
if (currentStyle.HasAlignment())
{
currentStyle.SetAlignment(style.GetAlignment());
}
- if (style.HasTabs() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_TABS))
+ if (style.HasTabs() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_TABS))
{
if (currentStyle.HasTabs())
{
currentStyle.SetTabs(style.GetTabs());
}
- if (style.HasLeftIndent() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LEFT_INDENT))
+ if (style.HasLeftIndent() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_LEFT_INDENT))
{
if (currentStyle.HasLeftIndent())
{
currentStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
}
- if (style.HasRightIndent() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_RIGHT_INDENT))
+ if (style.HasRightIndent() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_RIGHT_INDENT))
{
if (currentStyle.HasRightIndent())
{
currentStyle.SetRightIndent(style.GetRightIndent());
}
- if (style.HasParagraphSpacingAfter() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_AFTER))
+ if (style.HasParagraphSpacingAfter() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_PARA_SPACING_AFTER))
{
if (currentStyle.HasParagraphSpacingAfter())
{
currentStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
}
- if (style.HasParagraphSpacingBefore() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARA_SPACING_BEFORE))
+ if (style.HasParagraphSpacingBefore() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_PARA_SPACING_BEFORE))
{
if (currentStyle.HasParagraphSpacingBefore())
{
currentStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
}
- if (style.HasLineSpacing() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LINE_SPACING))
+ if (style.HasLineSpacing() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_LINE_SPACING))
{
if (currentStyle.HasLineSpacing())
{
currentStyle.SetLineSpacing(style.GetLineSpacing());
}
- if (style.HasCharacterStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_CHARACTER_STYLE_NAME))
+ if (style.HasCharacterStyleName() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_CHARACTER_STYLE_NAME))
{
if (currentStyle.HasCharacterStyleName())
{
currentStyle.SetCharacterStyleName(style.GetCharacterStyleName());
}
- if (style.HasParagraphStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_PARAGRAPH_STYLE_NAME))
+ if (style.HasParagraphStyleName() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_PARAGRAPH_STYLE_NAME))
{
if (currentStyle.HasParagraphStyleName())
{
currentStyle.SetParagraphStyleName(style.GetParagraphStyleName());
}
- if (style.HasListStyleName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_LIST_STYLE_NAME))
+ if (style.HasListStyleName() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_LIST_STYLE_NAME))
{
if (currentStyle.HasListStyleName())
{
currentStyle.SetListStyleName(style.GetListStyleName());
}
- if (style.HasBulletStyle() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_STYLE))
+ if (style.HasBulletStyle() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_BULLET_STYLE))
{
if (currentStyle.HasBulletStyle())
{
currentStyle.SetBulletStyle(style.GetBulletStyle());
}
- if (style.HasBulletNumber() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NUMBER))
+ if (style.HasBulletNumber() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_BULLET_NUMBER))
{
if (currentStyle.HasBulletNumber())
{
currentStyle.SetBulletNumber(style.GetBulletNumber());
}
- if (style.HasBulletText() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_TEXT))
+ if (style.HasBulletText() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_BULLET_TEXT))
{
if (currentStyle.HasBulletText())
{
}
}
- if (style.HasBulletName() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_BULLET_NAME))
+ if (style.HasBulletName() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_BULLET_NAME))
{
if (currentStyle.HasBulletName())
{
}
}
- if (style.HasURL() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_URL))
+ if (style.HasURL() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_URL))
{
if (currentStyle.HasURL())
{
}
}
- if (style.HasTextEffects() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_EFFECTS))
+ if (style.HasTextEffects() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_EFFECTS))
{
if (currentStyle.HasTextEffects())
{
// We need to find the bits in the new style that are different:
// just look at those bits that are specified by the new style.
+ // We need to remove the bits and flags that are not common between current style
+ // and new style. In so doing we need to take account of the styles absent from one or more of the
+ // previous styles.
+
int currentRelevantTextEffects = currentStyle.GetTextEffects() & style.GetTextEffectFlags();
int newRelevantTextEffects = style.GetTextEffects() & style.GetTextEffectFlags();
currentStyle.SetTextEffects(style.GetTextEffects());
currentStyle.SetTextEffectFlags(style.GetTextEffectFlags());
}
+
+ // Mask out the flags and values that cannot be common because they were absent in one or more objecrs
+ // that we've looked at so far
+ currentStyle.SetTextEffects(currentStyle.GetTextEffects() & ~absentTextEffectAttributes);
+ currentStyle.SetTextEffectFlags(currentStyle.GetTextEffectFlags() & ~absentTextEffectAttributes);
+
+ if (currentStyle.GetTextEffectFlags() == 0)
+ currentStyle.SetFlags(currentStyle.GetFlags() & ~wxTEXT_ATTR_EFFECTS);
}
- if (style.HasOutlineLevel() && !wxHasStyle(multipleStyleAttributes, wxTEXT_ATTR_OUTLINE_LEVEL))
+ if (style.HasOutlineLevel() && !wxHasStyle(multipleStyleAttributes|absentStyleAttributes, wxTEXT_ATTR_OUTLINE_LEVEL))
{
if (currentStyle.HasOutlineLevel())
{
/// that attribute is not present within the flags.
/// *** Note that this is not recursive, and so assumes that content inside a paragraph is not itself
/// nested.
-bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range, wxTextAttrEx& style)
+bool wxRichTextParagraphLayoutBox::GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style)
{
- style = wxTextAttrEx();
+ style = wxTextAttr();
// The attributes that aren't valid because of multiple styles within the range
long multipleStyleAttributes = 0;
int multipleTextEffectAttributes = 0;
+ int absentStyleAttributesPara = 0;
+ int absentStyleAttributesChar = 0;
+ int absentTextEffectAttributesPara = 0;
+ int absentTextEffectAttributesChar = 0;
+
wxRichTextObjectList::compatibility_iterator node = GetChildren().GetFirst();
while (node)
{
{
if (para->GetChildren().GetCount() == 0)
{
- wxTextAttrEx paraStyle = para->GetCombinedAttributes();
+ wxTextAttr paraStyle = para->GetCombinedAttributes();
- CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes);
+ CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes, absentStyleAttributesPara, absentTextEffectAttributesPara);
}
else
{
paraRange.LimitTo(range);
// First collect paragraph attributes only
- wxTextAttrEx paraStyle = para->GetCombinedAttributes();
+ wxTextAttr paraStyle = para->GetCombinedAttributes();
paraStyle.SetFlags(paraStyle.GetFlags() & wxTEXT_ATTR_PARAGRAPH);
- CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes);
+ CollectStyle(style, paraStyle, multipleStyleAttributes, multipleTextEffectAttributes, absentStyleAttributesPara, absentTextEffectAttributesPara);
wxRichTextObjectList::compatibility_iterator childNode = para->GetChildren().GetFirst();
wxRichTextObject* child = childNode->GetData();
if (!(child->GetRange().GetStart() > range.GetEnd() || child->GetRange().GetEnd() < range.GetStart()))
{
- wxTextAttrEx childStyle = para->GetCombinedAttributes(child->GetAttributes());
+ wxTextAttr childStyle = para->GetCombinedAttributes(child->GetAttributes());
// Now collect character attributes only
childStyle.SetFlags(childStyle.GetFlags() & wxTEXT_ATTR_CHARACTER);
- CollectStyle(style, childStyle, multipleStyleAttributes, multipleTextEffectAttributes);
+ CollectStyle(style, childStyle, multipleStyleAttributes, multipleTextEffectAttributes, absentStyleAttributesChar, absentTextEffectAttributesChar);
}
childNode = childNode->GetNext();
}
/// Set default style
-bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttrEx& style)
+bool wxRichTextParagraphLayoutBox::SetDefaultStyle(const wxTextAttr& style)
{
m_defaultAttributes = style;
return true;
/// of the attributes are different within the range, the test fails. You
/// can use this to implement, for example, bold button updating. style must have
/// flags indicating which attributes are of interest.
-bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const
+bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxTextAttr& style) const
{
int foundCount = 0;
int matchingCount = 0;
if (!child->GetRange().IsOutside(range) && child->IsKindOf(CLASSINFO(wxRichTextPlainText)))
{
foundCount ++;
- wxTextAttrEx textAttr = para->GetCombinedAttributes(child->GetAttributes());
+ wxTextAttr textAttr = para->GetCombinedAttributes(child->GetAttributes());
if (wxTextAttrEqPartial(textAttr, style, style.GetFlags()))
matchingCount ++;
return foundCount == matchingCount;
}
-bool wxRichTextParagraphLayoutBox::HasCharacterAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const
-{
- wxRichTextAttr richStyle = style;
- return HasCharacterAttributes(range, richStyle);
-}
-
/// Test if this whole range has paragraph attributes of the specified kind. If any
/// of the attributes are different within the range, the test fails. You
/// can use this to implement, for example, centering button updating. style must have
/// flags indicating which attributes are of interest.
-bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const
+bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxTextAttr& style) const
{
int foundCount = 0;
int matchingCount = 0;
if (!para->GetRange().IsOutside(range))
{
- wxTextAttrEx textAttr = GetAttributes();
+ wxTextAttr textAttr = GetAttributes();
// Apply the paragraph style
wxRichTextApplyStyle(textAttr, para->GetAttributes());
return foundCount == matchingCount;
}
-bool wxRichTextParagraphLayoutBox::HasParagraphAttributes(const wxRichTextRange& range, const wxTextAttrEx& style) const
-{
- wxRichTextAttr richStyle = style;
- return HasParagraphAttributes(range, richStyle);
-}
-
void wxRichTextParagraphLayoutBox::Clear()
{
DeleteChildren();
{
Clear();
+ wxRichTextBuffer* buffer = wxDynamicCast(this, wxRichTextBuffer);
+ if (buffer && GetRichTextCtrl())
+ {
+ wxRichTextEvent event(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, GetRichTextCtrl()->GetId());
+ event.SetEventObject(GetRichTextCtrl());
+
+ buffer->SendEvent(event, true);
+ }
+
AddParagraph(wxEmptyString);
Invalidate(wxRICHTEXT_ALL);
int foundCount = 0;
+ wxRichTextAttr attr(GetBasicStyle());
+ if (GetBasicStyle().HasParagraphStyleName())
+ {
+ wxRichTextParagraphStyleDefinition* paraDef = styleSheet->FindParagraphStyle(GetBasicStyle().GetParagraphStyleName());
+ if (paraDef)
+ {
+ attr.Apply(paraDef->GetStyleMergedWithBase(styleSheet));
+ SetBasicStyle(attr);
+ foundCount ++;
+ }
+ }
+
+ if (GetBasicStyle().HasCharacterStyleName())
+ {
+ wxRichTextCharacterStyleDefinition* charDef = styleSheet->FindCharacterStyle(GetBasicStyle().GetCharacterStyleName());
+ if (charDef)
+ {
+ attr.Apply(charDef->GetStyleMergedWithBase(styleSheet));
+ SetBasicStyle(attr);
+ foundCount ++;
+ }
+ }
+
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
// Renumbering will need to be done when we promote/demote a paragraph.
// Apply the overall list style, and item style for this level
- wxTextAttrEx listStyle(def->GetCombinedStyleForLevel(thisLevel, styleSheet));
+ wxTextAttr listStyle(def->GetCombinedStyleForLevel(thisLevel, styleSheet));
wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
// Now we need to do numbering
}
// Apply the overall list style, and item style for this level
- wxTextAttrEx listStyle(defToUse->GetCombinedStyleForLevel(thisLevel, styleSheet));
+ wxTextAttr listStyle(defToUse->GetCombinedStyleForLevel(thisLevel, styleSheet));
wxRichTextApplyStyle(newPara->GetAttributes(), listStyle);
// OK, we've (re)applied the style, now let's get the numbering right.
/// 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
+bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph* previousParagraph, wxTextAttr& attr) const
{
if (!previousParagraph->GetAttributes().HasFlag(wxTEXT_ATTR_BULLET_STYLE) || previousParagraph->GetAttributes().GetBulletStyle() == wxTEXT_ATTR_BULLET_STYLE_NONE)
return false;
wxArrayInt wxRichTextParagraph::sm_defaultTabs;
-wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttrEx* style):
+wxRichTextParagraph::wxRichTextParagraph(wxRichTextObject* parent, wxTextAttr* style):
wxRichTextBox(parent)
{
if (style)
SetAttributes(*style);
}
-wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* paraStyle, wxTextAttrEx* charStyle):
+wxRichTextParagraph::wxRichTextParagraph(const wxString& text, wxRichTextObject* parent, wxTextAttr* paraStyle, wxTextAttr* charStyle):
wxRichTextBox(parent)
{
if (paraStyle)
}
/// Draw the item
-bool wxRichTextParagraph::Draw(wxDC& dc, const wxRichTextRange& 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& rect, int WXUNUSED(descent), int style)
{
- wxTextAttrEx attr = GetCombinedAttributes();
+ wxTextAttr attr = GetCombinedAttributes();
// Draw the bullet, if any
if (attr.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE)
int spaceBeforePara = ConvertTenthsMMToPixels(dc, attr.GetParagraphSpacingBefore());
int leftIndent = ConvertTenthsMMToPixels(dc, attr.GetLeftIndent());
- wxTextAttrEx bulletAttr(GetCombinedAttributes());
+ wxTextAttr bulletAttr(GetCombinedAttributes());
// Combine with the font of the first piece of content, if one is specified
if (GetChildren().GetCount() > 0)
else
{
wxFont font;
- if (bulletAttr.GetFont().Ok())
- font = bulletAttr.GetFont();
+ if (bulletAttr.HasFont() && GetBuffer())
+ font = GetBuffer()->GetFontTable().FindFont(bulletAttr);
else
font = (*wxNORMAL_FONT);
- dc.SetFont(font);
+ wxCheckSetFont(dc, font);
lineHeight = dc.GetCharHeight();
linePos = GetPosition();
wxRichTextLine* line = node->GetData();
wxRichTextRange lineRange = line->GetAbsoluteRange();
- int maxDescent = line->GetDescent();
-
// Lines are specified relative to the paragraph
wxPoint linePosition = line->GetPosition() + GetPosition();
- wxPoint objectPosition = linePosition;
- // Loop through objects until we get to the one within range
- wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
- while (node2)
+ // Don't draw if off the screen
+ if (((style & wxRICHTEXT_DRAW_IGNORE_CACHE) != 0) || ((linePosition.y + line->GetSize().y) >= rect.y && linePosition.y <= rect.y + rect.height))
{
- wxRichTextObject* child = node2->GetData();
+ wxPoint objectPosition = linePosition;
+ int maxDescent = line->GetDescent();
- if (!child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range))
+ // Loop through objects until we get to the one within range
+ wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
+
+ int i = 0;
+ while (node2)
{
- // Draw this part of the line at the correct position
- wxRichTextRange objectRange(child->GetRange());
- objectRange.LimitTo(lineRange);
+ wxRichTextObject* child = node2->GetData();
- wxSize objectSize;
- int descent = 0;
- child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition);
+ if (child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange) && !lineRange.IsOutside(range))
+ {
+ // Draw this part of the line at the correct position
+ wxRichTextRange objectRange(child->GetRange());
+ objectRange.LimitTo(lineRange);
- // Use the child object's width, but the whole line's height
- wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y));
- child->Draw(dc, objectRange, selectionRange, childRect, maxDescent, style);
+ wxSize objectSize;
+#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING && wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+ if (i < (int) line->GetObjectSizes().GetCount())
+ {
+ objectSize.x = line->GetObjectSizes()[(size_t) i];
+ }
+ else
+#endif
+ {
+ int descent = 0;
+ child->GetRangeSize(objectRange, objectSize, descent, dc, wxRICHTEXT_UNFORMATTED, objectPosition);
+ }
- objectPosition.x += objectSize.x;
- }
- else if (child->GetRange().GetStart() > lineRange.GetEnd())
- // Can break out of inner loop now since we've passed this line's range
- break;
+ // Use the child object's width, but the whole line's height
+ wxRect childRect(objectPosition, wxSize(objectSize.x, line->GetSize().y));
+ child->Draw(dc, objectRange, selectionRange, childRect, maxDescent, style);
- node2 = node2->GetNext();
+ objectPosition.x += objectSize.x;
+ i ++;
+ }
+ else if (child->GetRange().GetStart() > lineRange.GetEnd())
+ // Can break out of inner loop now since we've passed this line's range
+ break;
+
+ node2 = node2->GetNext();
+ }
}
node = node->GetNext();
return true;
}
+// Get the range width using partial extents calculated for the whole paragraph.
+static int wxRichTextGetRangeWidth(const wxRichTextParagraph& para, const wxRichTextRange& range, const wxArrayInt& partialExtents)
+{
+ wxASSERT(partialExtents.GetCount() >= (size_t) range.GetLength());
+
+ if (partialExtents.GetCount() < (size_t) range.GetLength())
+ return 0;
+
+ int leftMostPos = 0;
+ if (range.GetStart() - para.GetRange().GetStart() > 0)
+ leftMostPos = partialExtents[range.GetStart() - para.GetRange().GetStart() - 1];
+
+ int rightMostPos = partialExtents[range.GetEnd() - para.GetRange().GetStart()];
+
+ int w = rightMostPos - leftMostPos;
+
+ return w;
+}
+
/// Lay the item out
bool wxRichTextParagraph::Layout(wxDC& dc, const wxRect& rect, int style)
{
- wxTextAttrEx attr = GetCombinedAttributes();
+ wxTextAttr attr = GetCombinedAttributes();
// ClearLines();
int lineSpacing = 0;
// Let's assume line spacing of 10 is normal, 15 is 1.5, 20 is 2, etc.
- if (attr.GetLineSpacing() > 10 && attr.GetFont().Ok())
+ if (attr.GetLineSpacing() != 10 && GetBuffer())
{
- dc.SetFont(attr.GetFont());
+ wxFont font(GetBuffer()->GetFontTable().FindFont(attr));
+ wxCheckSetFont(dc, font);
lineSpacing = (ConvertTenthsMMToPixels(dc, dc.GetCharHeight()) * attr.GetLineSpacing())/10;
}
int lineCount = 0;
+ wxRichTextObjectList::compatibility_iterator node;
+
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+ wxUnusedVar(style);
+ wxArrayInt partialExtents;
+
+ wxSize paraSize;
+ int paraDescent;
+
+ // This calculates the partial text extents
+ GetRangeSize(GetRange(), paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_CACHE_SIZE, wxPoint(0,0), & partialExtents);
+#else
+ node = m_children.GetFirst();
+ while (node)
+ {
+ wxRichTextObject* child = node->GetData();
+
+ child->SetCachedSize(wxDefaultSize);
+ child->Layout(dc, rect, style);
+
+ node = node->GetNext();
+ }
+
+#endif
+
// Split up lines
// We may need to go back to a previous child, in which case create the new line,
// find the child corresponding to the start position of the string, and
// continue.
- wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
+ node = m_children.GetFirst();
while (node)
{
wxRichTextObject* child = node->GetData();
+ if (child->GetRange().GetLength() == 0)
+ {
+ node = node->GetNext();
+ continue;
+ }
+
// If this is e.g. a composite text box, it will need to be laid out itself.
// But if just a text fragment or image, for example, this will
// do nothing. NB: won't we need to set the position after layout?
// can't tell the position until the size is determined. So possibly introduce
// another layout phase.
- // TODO: can't this be called only once per child?
- child->Layout(dc, rect, style);
-
// Available width depends on whether we're on the first or subsequent lines
int availableSpaceForText = (lineCount == 0 ? availableTextSpaceFirstLine : availableTextSpaceSubsequentLines);
childDescent = child->GetDescent();
}
else
+ {
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+ // Get height only, then the width using the partial extents
+ GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY);
+ childSize.x = wxRichTextGetRangeWidth(*this, wxRichTextRange(lastEndPos+1, lastPosToUse), partialExtents);
+#else
GetRangeSize(wxRichTextRange(lastEndPos+1, lastPosToUse), childSize, childDescent, dc, wxRICHTEXT_UNFORMATTED, rect.GetPosition());
+#endif
+ }
// Cases:
// 1) There was a line break BEFORE the natural break
// Find a place to wrap. This may walk back to previous children,
// for example if a word spans several objects.
- if (!FindWrapPosition(wxRichTextRange(lastCompletedEndPos+1, child->GetRange().GetEnd()), dc, availableSpaceForText, wrapPosition))
+ if (!FindWrapPosition(wxRichTextRange(lastCompletedEndPos+1, child->GetRange().GetEnd()), dc, availableSpaceForText, wrapPosition, & partialExtents))
{
// If the function failed, just cut it off at the end of this child.
wrapPosition = child->GetRange().GetEnd();
// Let's find the actual size of the current line now
wxSize actualSize;
wxRichTextRange actualRange(lastCompletedEndPos+1, wrapPosition);
+
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+ // Get height only, then the width using the partial extents
+ GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED|wxRICHTEXT_HEIGHT_ONLY);
+ actualSize.x = wxRichTextGetRangeWidth(*this, actualRange, partialExtents);
+#else
GetRangeSize(actualRange, actualSize, childDescent, dc, wxRICHTEXT_UNFORMATTED);
+#endif
+
currentWidth = actualSize.x;
lineHeight = wxMax(lineHeight, actualSize.y);
maxDescent = wxMax(childDescent, maxDescent);
line->SetPosition(currentPosition);
- if (lineHeight == 0)
+ if (lineHeight == 0 && GetBuffer())
{
- if (attr.GetFont().Ok())
- dc.SetFont(attr.GetFont());
+ wxFont font(GetBuffer()->GetFontTable().FindFont(attr));
+ wxCheckSetFont(dc, font);
lineHeight = dc.GetCharHeight();
}
if (maxDescent == 0)
m_dirty = false;
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING
+ // Use the text extents to calculate the size of each fragment in each line
+ wxRichTextLineList::compatibility_iterator lineNode = m_cachedLines.GetFirst();
+ while (lineNode)
+ {
+ wxRichTextLine* line = lineNode->GetData();
+ wxRichTextRange lineRange = line->GetAbsoluteRange();
+
+ // Loop through objects until we get to the one within range
+ wxRichTextObjectList::compatibility_iterator node2 = m_children.GetFirst();
+
+ while (node2)
+ {
+ wxRichTextObject* child = node2->GetData();
+
+ if (child->GetRange().GetLength() > 0 && !child->GetRange().IsOutside(lineRange))
+ {
+ wxRichTextRange rangeToUse = lineRange;
+ rangeToUse.LimitTo(child->GetRange());
+
+ // Find the size of the child from the text extents, and store in an array
+ // for drawing later
+ int left = 0;
+ if (rangeToUse.GetStart() > GetRange().GetStart())
+ left = partialExtents[(rangeToUse.GetStart()-1) - GetRange().GetStart()];
+ int right = partialExtents[rangeToUse.GetEnd() - GetRange().GetStart()];
+ int sz = right - left;
+ line->GetObjectSizes().Add(sz);
+ }
+ else if (child->GetRange().GetStart() > lineRange.GetEnd())
+ // Can break out of inner loop now since we've passed this line's range
+ break;
+
+ node2 = node2->GetNext();
+ }
+
+ lineNode = lineNode->GetNext();
+ }
+#endif
+#endif
+
return true;
}
/// Apply paragraph styles, such as centering, to wrapped lines
-void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttrEx& attr, const wxRect& rect)
+void wxRichTextParagraph::ApplyParagraphStyle(const wxTextAttr& attr, const wxRect& rect)
{
if (!attr.HasAlignment())
return;
/// Get/set the object size for the given range. Returns false if the range
/// is invalid for this object.
-bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position) const
+bool wxRichTextParagraph::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int flags, wxPoint position, wxArrayInt* partialExtents) const
{
if (!range.IsWithin(GetRange()))
return false;
wxSize sz;
+ wxArrayInt childExtents;
+ wxArrayInt* p;
+ if (partialExtents)
+ p = & childExtents;
+ else
+ p = NULL;
+
wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
+
wxRichTextObject* child = node->GetData();
if (!child->GetRange().IsOutside(range))
{
rangeToUse.LimitTo(child->GetRange());
int childDescent = 0;
- if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y)))
+ // At present wxRICHTEXT_HEIGHT_ONLY is only fast if we're already cached the size,
+ // but it's only going to be used after caching has taken place.
+ if ((flags & wxRICHTEXT_HEIGHT_ONLY) && child->GetCachedSize().y != 0)
{
+ childDescent = child->GetDescent();
+ childSize = child->GetCachedSize();
+
sz.y = wxMax(sz.y, childSize.y);
sz.x += childSize.x;
descent = wxMax(descent, childDescent);
}
- }
+ else if (child->GetRangeSize(rangeToUse, childSize, childDescent, dc, flags, wxPoint(position.x + sz.x, position.y), p))
+ {
+ sz.y = wxMax(sz.y, childSize.y);
+ sz.x += childSize.x;
+ descent = wxMax(descent, childDescent);
+
+ if ((flags & wxRICHTEXT_CACHE_SIZE) && (rangeToUse == child->GetRange()))
+ {
+ child->SetCachedSize(childSize);
+ child->SetDescent(childDescent);
+ }
+
+ if (partialExtents)
+ {
+ int lastSize;
+ if (partialExtents->GetCount() > 0)
+ lastSize = (*partialExtents)[partialExtents->GetCount()-1];
+ else
+ lastSize = 0;
+
+ size_t i;
+ for (i = 0; i < childExtents.GetCount(); i++)
+ {
+ partialExtents->Add(childExtents[i] + lastSize);
+ }
+ }
+ }
+
+ if (p)
+ p->Clear();
+ }
node = node->GetNext();
}
wxSize lineSize = line->GetSize();
wxRichTextRange lineRange = line->GetAbsoluteRange();
- if (pt.y >= linePos.y && pt.y <= linePos.y + lineSize.y)
+ if (pt.y <= linePos.y + lineSize.y)
{
if (pt.x < linePos.x)
{
}
else
{
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+ wxArrayInt partialExtents;
+
+ wxSize paraSize;
+ int paraDescent;
+
+ // This calculates the partial text extents
+ GetRangeSize(lineRange, paraSize, paraDescent, dc, wxRICHTEXT_UNFORMATTED, wxPoint(0,0), & partialExtents);
+
+ int lastX = linePos.x;
+ size_t i;
+ for (i = 0; i < partialExtents.GetCount(); i++)
+ {
+ int nextX = partialExtents[i] + linePos.x;
+
+ if (pt.x >= lastX && pt.x <= nextX)
+ {
+ textPosition = i + lineRange.GetStart(); // minus 1?
+
+ // So now we know it's between i-1 and i.
+ // Let's see if we can be more precise about
+ // which side of the position it's on.
+
+ int midPoint = (nextX - lastX)/2 + lastX;
+ if (pt.x >= midPoint)
+ return wxRICHTEXT_HITTEST_AFTER;
+ else
+ return wxRICHTEXT_HITTEST_BEFORE;
+ }
+
+ lastX = nextX;
+ }
+#else
long i;
int lastX = linePos.x;
for (i = lineRange.GetStart(); i <= lineRange.GetEnd(); i++)
lastX = nextX;
}
}
+#endif
}
}
text += textObj->GetTextForRange(range);
}
else
- return true;
+ {
+ text += wxT(" ");
+ }
}
node = node->GetNext();
text = textObj->GetTextForRange(range) + text;
}
else
- return true;
+ {
+ text = wxT(" ") + text;
+ }
}
node = node->GetPrevious();
}
/// Find a suitable wrap position.
-bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition)
+bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& dc, int availableSpace, long& wrapPosition, wxArrayInt* partialExtents)
{
+ if (range.GetLength() <= 0)
+ return false;
+
// Find the first position where the line exceeds the available space.
wxSize sz;
- long i;
long breakPosition = range.GetEnd();
- for (i = range.GetStart(); i <= range.GetEnd(); i++)
+
+#if wxRICHTEXT_USE_PARTIAL_TEXT_EXTENTS
+ if (partialExtents && partialExtents->GetCount() >= (size_t) (GetRange().GetLength()-1)) // the final position in a paragraph is the newline
{
- int descent = 0;
- GetRangeSize(wxRichTextRange(range.GetStart(), i), sz, descent, dc, wxRICHTEXT_UNFORMATTED);
+ int widthBefore;
+
+ if (range.GetStart() > GetRange().GetStart())
+ widthBefore = (*partialExtents)[range.GetStart() - GetRange().GetStart() - 1];
+ else
+ widthBefore = 0;
- if (sz.x > availableSpace)
+ size_t i;
+ for (i = (size_t) range.GetStart(); i < (size_t) range.GetEnd(); i++)
{
- breakPosition = i-1;
- break;
+ int widthFromStartOfThisRange = (*partialExtents)[i - GetRange().GetStart()] - widthBefore;
+
+ if (widthFromStartOfThisRange > availableSpace)
+ {
+ breakPosition = i-1;
+ break;
+ }
+ }
+ }
+ else
+#endif
+ {
+ // Binary chop for speed
+ long minPos = range.GetStart();
+ long maxPos = range.GetEnd();
+ while (true)
+ {
+ if (minPos == maxPos)
+ {
+ int descent = 0;
+ GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED);
+
+ if (sz.x > availableSpace)
+ breakPosition = minPos - 1;
+ break;
+ }
+ else if ((maxPos - minPos) == 1)
+ {
+ int descent = 0;
+ GetRangeSize(wxRichTextRange(range.GetStart(), minPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED);
+
+ if (sz.x > availableSpace)
+ breakPosition = minPos - 1;
+ else
+ {
+ GetRangeSize(wxRichTextRange(range.GetStart(), maxPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED);
+ if (sz.x > availableSpace)
+ breakPosition = maxPos-1;
+ }
+ break;
+ }
+ else
+ {
+ long nextPos = minPos + ((maxPos - minPos) / 2);
+
+ int descent = 0;
+ GetRangeSize(wxRichTextRange(range.GetStart(), nextPos), sz, descent, dc, wxRICHTEXT_UNFORMATTED);
+
+ if (sz.x > availableSpace)
+ {
+ maxPos = nextPos;
+ }
+ else
+ {
+ minPos = nextPos;
+ }
+ }
}
}
/// Get combined attributes of the base style, paragraph style and character style. We use this to dynamically
/// retrieve the actual style.
-wxTextAttrEx wxRichTextParagraph::GetCombinedAttributes(const wxTextAttrEx& contentStyle) const
+wxTextAttr wxRichTextParagraph::GetCombinedAttributes(const wxTextAttr& contentStyle) const
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer);
if (buf)
{
}
/// Get combined attributes of the base style and paragraph style.
-wxTextAttrEx wxRichTextParagraph::GetCombinedAttributes() const
+wxTextAttr wxRichTextParagraph::GetCombinedAttributes() const
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
wxRichTextBuffer* buf = wxDynamicCast(GetParent(), wxRichTextBuffer);
if (buf)
{
m_pos = wxPoint(0, 0);
m_size = wxSize(0, 0);
m_descent = 0;
+#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING
+ m_objectSizes.Clear();
+#endif
}
/// Copy
void wxRichTextLine::Copy(const wxRichTextLine& obj)
{
m_range = obj.m_range;
+#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING
+ m_objectSizes = obj.m_objectSizes;
+#endif
}
/// Get the absolute object position
IMPLEMENT_DYNAMIC_CLASS(wxRichTextPlainText, wxRichTextObject)
-wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxTextAttrEx* style):
+wxRichTextPlainText::wxRichTextPlainText(const wxString& text, wxRichTextObject* parent, wxTextAttr* style):
wxRichTextObject(parent)
{
if (style)
wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
wxASSERT (para != NULL);
- wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+ wxTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
int offset = GetRange().GetStart();
wxString str = m_text;
wxString toRemove = wxRichTextLineBreakChar;
str.Replace(toRemove, wxT(" "));
+ if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
+ str.MakeUpper();
long len = range.GetLength();
wxString stringChunk = str.Mid(range.GetStart() - offset, (size_t) len);
- if (textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
- stringChunk.MakeUpper();
-
- int charHeight = dc.GetCharHeight();
-
- int x = rect.x;
- int y = rect.y + (rect.height - charHeight - (descent - m_descent));
// Test for the optimized situations where all is selected, or none
// is selected.
- if (textAttr.GetFont().Ok())
- dc.SetFont(textAttr.GetFont());
+ wxFont textFont(GetBuffer()->GetFontTable().FindFont(textAttr));
+ wxCheckSetFont(dc, textFont);
+ int charHeight = dc.GetCharHeight();
+
+ int x, y;
+ if ( textFont.Ok() )
+ {
+ if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT) )
+ {
+ double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
+ textFont.SetPointSize( static_cast<int>(size) );
+ x = rect.x;
+ y = rect.y;
+ wxCheckSetFont(dc, textFont);
+ }
+ else if ( textAttr.HasTextEffects() && (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) )
+ {
+ double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
+ textFont.SetPointSize( static_cast<int>(size) );
+ x = rect.x;
+ int sub_height = static_cast<int>( static_cast<double>(charHeight) / wxSCRIPT_MUL_FACTOR);
+ y = rect.y + (rect.height - sub_height + (descent - m_descent));
+ wxCheckSetFont(dc, textFont);
+ }
+ else
+ {
+ x = rect.x;
+ y = rect.y + (rect.height - charHeight - (descent - m_descent));
+ }
+ }
+ else
+ {
+ x = rect.x;
+ y = rect.y + (rect.height - charHeight - (descent - m_descent));
+ }
// (a) All selected.
if (selectionRange.GetStart() <= range.GetStart() && selectionRange.GetEnd() >= range.GetEnd())
// (c) Part selected, part not
// Let's draw unselected chunk, selected chunk, then unselected chunk.
- dc.SetBackgroundMode(wxTRANSPARENT);
+ dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
// 1. Initial unselected chunk, if any, up until start of selection.
if (selectionRange.GetStart() > range.GetStart() && selectionRange.GetStart() <= range.GetEnd())
return true;
}
-bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, const wxRect& rect,wxString& str, wxCoord& x, wxCoord& y, bool selected)
+bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttr& attr, const wxRect& rect,wxString& str, wxCoord& x, wxCoord& y, bool selected)
{
bool hasTabs = (str.Find(wxT('\t')) != wxNOT_FOUND);
if (selected)
{
- dc.SetBrush(*wxBLACK_BRUSH);
- dc.SetPen(*wxBLACK_PEN);
- dc.SetTextForeground(*wxWHITE);
- dc.SetBackgroundMode(wxTRANSPARENT);
+ wxColour highlightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+ wxColour highlightTextColour(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+
+ wxCheckSetBrush(dc, wxBrush(highlightColour));
+ wxCheckSetPen(dc, wxPen(highlightColour));
+ dc.SetTextForeground(highlightTextColour);
+ dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
}
else
{
if (attr.HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) && attr.GetBackgroundColour().IsOk())
{
- dc.SetBackgroundMode(wxSOLID);
+ dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID);
dc.SetTextBackground(attr.GetBackgroundColour());
}
else
- dc.SetBackgroundMode(wxTRANSPARENT);
+ dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
}
while (hasTabs)
if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
{
wxPen oldPen = dc.GetPen();
- dc.SetPen(wxPen(attr.GetTextColour(), 1));
+ wxCheckSetPen(dc, wxPen(attr.GetTextColour(), 1));
dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));
- dc.SetPen(oldPen);
+ wxCheckSetPen(dc, oldPen);
}
x = nextTabPos;
if (attr.HasTextEffects() && (attr.GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH))
{
wxPen oldPen = dc.GetPen();
- dc.SetPen(wxPen(attr.GetTextColour(), 1));
+ wxCheckSetPen(dc, wxPen(attr.GetTextColour(), 1));
dc.DrawLine(x, (int) (y+(h/2)+0.5), x+w, (int) (y+(h/2)+0.5));
- dc.SetPen(oldPen);
+ wxCheckSetPen(dc, oldPen);
}
x += w;
/// Lay the item out
bool wxRichTextPlainText::Layout(wxDC& dc, const wxRect& WXUNUSED(rect), int WXUNUSED(style))
{
- GetRangeSize(GetRange(), m_size, m_descent, dc, 0, wxPoint(0, 0));
+ // Only lay out if we haven't already cached the size
+ if (m_size.x == -1)
+ GetRangeSize(GetRange(), m_size, m_descent, dc, 0, wxPoint(0, 0));
return true;
}
/// Get/set the object size for the given range. Returns false if the range
/// is invalid for this object.
-bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int WXUNUSED(flags), wxPoint position) const
+bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, int WXUNUSED(flags), wxPoint position, wxArrayInt* partialExtents) const
{
if (!range.IsWithin(GetRange()))
return false;
wxRichTextParagraph* para = wxDynamicCast(GetParent(), wxRichTextParagraph);
wxASSERT (para != NULL);
- wxTextAttrEx textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
+ wxTextAttr textAttr(para ? para->GetCombinedAttributes(GetAttributes()) : GetAttributes());
// Always assume unformatted text, since at this level we have no knowledge
// of line breaks - and we don't need it, since we'll calculate size within
// formatted text by doing it in chunks according to the line ranges
- if (textAttr.GetFont().Ok())
- dc.SetFont(textAttr.GetFont());
+ bool bScript(false);
+ wxFont font(GetBuffer()->GetFontTable().FindFont(textAttr));
+ if (font.Ok())
+ {
+ if ( textAttr.HasTextEffects() && ( (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUPERSCRIPT)
+ || (textAttr.GetTextEffects() & wxTEXT_ATTR_EFFECT_SUBSCRIPT) ) )
+ {
+ wxFont textFont = font;
+ double size = static_cast<double>(textFont.GetPointSize()) / wxSCRIPT_MUL_FACTOR;
+ textFont.SetPointSize( static_cast<int>(size) );
+ wxCheckSetFont(dc, textFont);
+ bScript = true;
+ }
+ else
+ {
+ wxCheckSetFont(dc, font);
+ }
+ }
+ bool haveDescent = false;
int startPos = range.GetStart() - GetRange().GetStart();
long len = range.GetLength();
while (stringChunk.Find(wxT('\t')) >= 0)
{
+ int absoluteWidth = 0;
+
// the string has a tab
// break up the string at the Tab
wxString stringFragment = stringChunk.BeforeFirst(wxT('\t'));
stringChunk = stringChunk.AfterFirst(wxT('\t'));
- dc.GetTextExtent(stringFragment, & w, & h);
- width += w;
- int absoluteWidth = width + position.x;
+
+ if (partialExtents)
+ {
+ int oldWidth;
+ if (partialExtents->GetCount() > 0)
+ oldWidth = (*partialExtents)[partialExtents->GetCount()-1];
+ else
+ oldWidth = 0;
+
+ // Add these partial extents
+ wxArrayInt p;
+ dc.GetPartialTextExtents(stringFragment, p);
+ size_t j;
+ for (j = 0; j < p.GetCount(); j++)
+ partialExtents->Add(oldWidth + p[j]);
+
+ if (partialExtents->GetCount() > 0)
+ absoluteWidth = (*partialExtents)[(*partialExtents).GetCount()-1] + position.x;
+ else
+ absoluteWidth = position.x;
+ }
+ else
+ {
+ dc.GetTextExtent(stringFragment, & w, & h);
+ width += w;
+ absoluteWidth = width + position.x;
+ haveDescent = true;
+ }
bool notFound = true;
for (int i = 0; i < tabCount && notFound; ++i)
notFound = false;
width = nextTabPos - position.x;
+
+ if (partialExtents)
+ partialExtents->Add(width);
}
}
}
}
- dc.GetTextExtent(stringChunk, & w, & h, & descent);
- width += w;
- size = wxSize(width, dc.GetCharHeight());
+
+ if (!stringChunk.IsEmpty())
+ {
+ if (partialExtents)
+ {
+ int oldWidth;
+ if (partialExtents->GetCount() > 0)
+ oldWidth = (*partialExtents)[partialExtents->GetCount()-1];
+ else
+ oldWidth = 0;
+
+ // Add these partial extents
+ wxArrayInt p;
+ dc.GetPartialTextExtents(stringChunk, p);
+ size_t j;
+ for (j = 0; j < p.GetCount(); j++)
+ partialExtents->Add(oldWidth + p[j]);
+ }
+ else
+ {
+ dc.GetTextExtent(stringChunk, & w, & h, & descent);
+ width += w;
+ haveDescent = true;
+ }
+ }
+
+ if (partialExtents)
+ {
+ int charHeight = dc.GetCharHeight();
+ if ((*partialExtents).GetCount() > 0)
+ w = (*partialExtents)[partialExtents->GetCount()-1];
+ else
+ w = 0;
+ size = wxSize(w, charHeight);
+ }
+ else
+ {
+ size = wxSize(width, dc.GetCharHeight());
+ }
+
+ if (!haveDescent)
+ dc.GetTextExtent(wxT("X"), & w, & h, & descent);
+
+ if ( bScript )
+ dc.SetFont(font);
return true;
}
if (textObject)
{
m_text += textObject->GetText();
+ wxRichTextApplyStyle(m_attributes, textObject->GetAttributes());
return true;
}
else
{
wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
- wxTextAttrEx attr(GetDefaultStyle());
+ wxTextAttr attr(GetDefaultStyle());
- wxTextAttrEx* p = NULL;
- wxTextAttrEx paraAttr;
+ wxTextAttr* p = NULL;
+ wxTextAttr paraAttr;
if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
{
paraAttr = GetStyleForNewParagraph(pos);
action->GetNewParagraphs() = paragraphs;
- if (p)
+ if (p && !p->IsDefault())
{
- wxRichTextObjectList::compatibility_iterator node = m_children.GetLast();
- while (node)
+ for (wxRichTextObjectList::compatibility_iterator node = action->GetNewParagraphs().GetChildren().GetFirst(); node; node = node->GetNext())
{
- wxRichTextParagraph* obj = (wxRichTextParagraph*) node->GetData();
- obj->SetAttributes(*p);
- node = node->GetPrevious();
+ wxRichTextObject* child = node->GetData();
+ child->SetAttributes(*p);
}
}
action->SetPosition(pos);
+ wxRichTextRange range = wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1);
+ if (!paragraphs.GetPartialParagraph())
+ range.SetEnd(range.GetEnd()+1);
+
// Set the range we'll need to delete in Undo
- action->SetRange(wxRichTextRange(pos, pos + paragraphs.GetRange().GetEnd() - 1));
+ action->SetRange(range);
SubmitAction(action);
{
wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
- wxTextAttrEx* p = NULL;
- wxTextAttrEx paraAttr;
+ wxTextAttr* p = NULL;
+ wxTextAttr paraAttr;
if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
{
// Get appropriate paragraph style
{
wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Text"), wxRICHTEXT_INSERT, this, ctrl, false);
- wxTextAttrEx* p = NULL;
- wxTextAttrEx paraAttr;
+ wxTextAttr* p = NULL;
+ wxTextAttr paraAttr;
if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
{
paraAttr = GetStyleForNewParagraph(pos, false, true /* look for next paragraph style */);
p = & paraAttr;
}
- wxTextAttrEx attr(GetDefaultStyle());
+ wxTextAttr attr(GetDefaultStyle());
wxRichTextParagraph* newPara = new wxRichTextParagraph(wxEmptyString, this, & attr);
action->GetNewParagraphs().AppendChild(newPara);
action->GetNewParagraphs().UpdateRanges();
action->GetNewParagraphs().SetPartialParagraph(false);
- action->SetPosition(pos);
+ wxRichTextParagraph* para = GetParagraphAtPosition(pos, false);
+ long pos1 = pos;
if (p)
newPara->SetAttributes(*p);
+ if (flags & wxRICHTEXT_INSERT_INTERACTIVE)
+ {
+ if (para && para->GetRange().GetEnd() == pos)
+ pos1 ++;
+
+ // Now see if we need to number the paragraph.
+ if (newPara->GetAttributes().HasBulletNumber())
+ {
+ wxRichTextAttr numberingAttr;
+ if (FindNextParagraphNumber(para, numberingAttr))
+ wxRichTextApplyStyle(newPara->GetAttributes(), (const wxRichTextAttr&) numberingAttr);
+ }
+ }
+
+ action->SetPosition(pos);
+
+ // Use the default character style
+ // Use the default character style
+ if (!GetDefaultStyle().IsDefault() && newPara->GetChildren().GetFirst())
+ {
+ // Check whether the default style merely reflects the paragraph/basic style,
+ // in which case don't apply it.
+ wxTextAttrEx defaultStyle(GetDefaultStyle());
+ wxTextAttrEx toApply;
+ if (para)
+ {
+ wxRichTextAttr combinedAttr = para->GetCombinedAttributes();
+ wxTextAttrEx newAttr;
+ // This filters out attributes that are accounted for by the current
+ // paragraph/basic style
+ wxRichTextApplyStyle(toApply, defaultStyle, & combinedAttr);
+ }
+ else
+ toApply = defaultStyle;
+
+ if (!toApply.IsDefault())
+ newPara->GetChildren().GetFirst()->GetData()->SetAttributes(toApply);
+ }
+
// Set the range we'll need to delete in Undo
- action->SetRange(wxRichTextRange(pos, pos));
+ action->SetRange(wxRichTextRange(pos1, pos1));
SubmitAction(action);
{
wxRichTextAction* action = new wxRichTextAction(NULL, _("Insert Image"), wxRICHTEXT_INSERT, this, ctrl, false);
- wxTextAttrEx* p = NULL;
- wxTextAttrEx paraAttr;
+ wxTextAttr* p = NULL;
+ wxTextAttr paraAttr;
if (flags & wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE)
{
paraAttr = GetStyleForNewParagraph(pos);
p = & paraAttr;
}
- wxTextAttrEx attr(GetDefaultStyle());
+ wxTextAttr attr(GetDefaultStyle());
wxRichTextParagraph* newPara = new wxRichTextParagraph(this, & attr);
if (p)
/// Get the style that is appropriate for a new paragraph at this position.
/// If the previous paragraph has a paragraph style name, look up the next-paragraph
/// style.
-wxRichTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition, bool lookUpNewParaStyle) const
+wxTextAttr wxRichTextBuffer::GetStyleForNewParagraph(long pos, bool caretPosition, bool lookUpNewParaStyle) const
{
wxRichTextParagraph* para = GetParagraphAtPosition(pos, caretPosition);
if (para)
{
- wxRichTextAttr attr;
+ wxTextAttr attr;
bool foundAttributes = false;
// Look for a matching paragraph style
wxRichTextParagraphStyleDefinition* paraDef = GetStyleSheet()->FindParagraphStyle(para->GetAttributes().GetParagraphStyleName());
if (paraDef)
{
- if (!paraDef->GetNextStyle().IsEmpty())
+ // If we're not at the end of the paragraph, then we apply THIS style, and not the designated next style.
+ if (para->GetRange().GetEnd() == pos && !paraDef->GetNextStyle().IsEmpty())
{
wxRichTextParagraphStyleDefinition* nextParaDef = GetStyleSheet()->FindParagraphStyle(paraDef->GetNextStyle());
if (nextParaDef)
}
}
}
+
+ // Also apply list style if present
+ if (lookUpNewParaStyle && !para->GetAttributes().GetListStyleName().IsEmpty() && GetStyleSheet())
+ {
+ wxRichTextListStyleDefinition* listDef = GetStyleSheet()->FindListStyle(para->GetAttributes().GetListStyleName());
+ if (listDef)
+ {
+ int thisIndent = para->GetAttributes().GetLeftIndent();
+ int thisLevel = para->GetAttributes().HasOutlineLevel() ? para->GetAttributes().GetOutlineLevel() : listDef->FindLevelForIndent(thisIndent);
+
+ // Apply the overall list style, and item style for this level
+ wxRichTextAttr listStyle(listDef->GetCombinedStyleForLevel(thisLevel, GetStyleSheet()));
+ wxRichTextApplyStyle(attr, listStyle);
+ attr.SetOutlineLevel(thisLevel);
+ if (para->GetAttributes().HasBulletNumber())
+ attr.SetBulletNumber(para->GetAttributes().GetBulletNumber());
+ }
+ }
+
if (!foundAttributes)
{
attr = para->GetAttributes();
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;
}
else
- return wxRichTextAttr();
+ return wxTextAttr();
}
/// Submit command to delete this range
// Copy the fragment that we'll need to restore in Undo
CopyFragment(range, action->GetOldParagraphs());
- // Special case: if there is only one (non-partial) paragraph,
- // we must save the *next* paragraph's style, because that
- // is the style we must apply when inserting the content back
- // when undoing the delete. (This is because we're merging the
- // paragraph with the previous paragraph and throwing away
- // the style, and we need to restore it.)
- if (!action->GetOldParagraphs().GetPartialParagraph() && action->GetOldParagraphs().GetChildCount() == 1)
+ // See if we're deleting a paragraph marker, in which case we need to
+ // make a note not to copy the attributes from the 2nd paragraph to the 1st.
+ if (range.GetStart() == range.GetEnd())
{
- wxRichTextParagraph* lastPara = GetParagraphAtPosition(range.GetStart());
- if (lastPara)
+ wxRichTextParagraph* para = GetParagraphAtPosition(range.GetStart());
+ if (para && para->GetRange().GetEnd() == range.GetEnd())
{
- wxRichTextParagraph* nextPara = GetParagraphAtPosition(range.GetEnd()+1);
- if (nextPara)
+ wxRichTextParagraph* nextPara = GetParagraphAtPosition(range.GetStart()+1);
+ if (nextPara && nextPara != para)
{
- wxRichTextParagraph* para = (wxRichTextParagraph*) action->GetOldParagraphs().GetChild(0);
- para->SetAttributes(nextPara->GetAttributes());
+ action->GetOldParagraphs().GetChildren().GetFirst()->GetData()->SetAttributes(nextPara->GetAttributes());
+ action->GetOldParagraphs().GetAttributes().SetFlags(action->GetOldParagraphs().GetAttributes().GetFlags() | wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE);
}
}
}
wxASSERT(m_batchedCommand == NULL);
if (m_batchedCommand)
{
- GetCommandProcessor()->Submit(m_batchedCommand);
+ GetCommandProcessor()->Store(m_batchedCommand);
}
m_batchedCommand = new wxRichTextCommand(cmdName);
}
if (m_batchedCommandDepth == 0)
{
- GetCommandProcessor()->Submit(m_batchedCommand);
+ GetCommandProcessor()->Store(m_batchedCommand);
m_batchedCommand = NULL;
}
bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action)
{
if (BatchingUndo() && m_batchedCommand && !SuppressingUndo())
+ {
+ wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName());
+ cmd->AddAction(action);
+ cmd->Do();
+ cmd->GetActions().Clear();
+ delete cmd;
+
m_batchedCommand->AddAction(action);
+ }
else
{
wxRichTextCommand* cmd = new wxRichTextCommand(action->GetName());
}
/// Begin using a style
-bool wxRichTextBuffer::BeginStyle(const wxTextAttrEx& style)
+bool wxRichTextBuffer::BeginStyle(const wxTextAttr& style)
{
- wxTextAttrEx newStyle(GetDefaultStyle());
+ wxTextAttr newStyle(GetDefaultStyle());
// Save the old default style
- m_attributeStack.Append((wxObject*) new wxTextAttrEx(GetDefaultStyle()));
+ m_attributeStack.Append((wxObject*) new wxTextAttr(GetDefaultStyle()));
wxRichTextApplyStyle(newStyle, style);
newStyle.SetFlags(style.GetFlags()|newStyle.GetFlags());
SetDefaultStyle(newStyle);
- // wxLogDebug("Default style size = %d", GetDefaultStyle().GetFont().GetPointSize());
-
return true;
}
}
wxList::compatibility_iterator node = m_attributeStack.GetLast();
- wxTextAttrEx* attr = (wxTextAttrEx*)node->GetData();
+ wxTextAttr* attr = (wxTextAttr*)node->GetData();
m_attributeStack.Erase(node);
SetDefaultStyle(*attr);
void wxRichTextBuffer::ClearStyleStack()
{
for (wxList::compatibility_iterator node = m_attributeStack.GetFirst(); node; node = node->GetNext())
- delete (wxTextAttrEx*) node->GetData();
+ delete (wxTextAttr*) node->GetData();
m_attributeStack.Clear();
}
/// Begin using bold
bool wxRichTextBuffer::BeginBold()
{
- wxFont font(GetBasicStyle().GetFont());
- font.SetWeight(wxBOLD);
-
- wxTextAttrEx attr;
- attr.SetFont(font,wxTEXT_ATTR_FONT_WEIGHT);
+ wxTextAttr attr;
+ attr.SetFontWeight(wxBOLD);
return BeginStyle(attr);
}
/// Begin using italic
bool wxRichTextBuffer::BeginItalic()
{
- wxFont font(GetBasicStyle().GetFont());
- font.SetStyle(wxITALIC);
-
- wxTextAttrEx attr;
- attr.SetFont(font, wxTEXT_ATTR_FONT_ITALIC);
+ wxTextAttr attr;
+ attr.SetFontStyle(wxITALIC);
return BeginStyle(attr);
}
/// Begin using underline
bool wxRichTextBuffer::BeginUnderline()
{
- wxFont font(GetBasicStyle().GetFont());
- font.SetUnderlined(true);
-
- wxTextAttrEx attr;
- attr.SetFont(font, wxTEXT_ATTR_FONT_UNDERLINE);
+ wxTextAttr attr;
+ attr.SetFontUnderlined(true);
return BeginStyle(attr);
}
/// Begin using point size
bool wxRichTextBuffer::BeginFontSize(int pointSize)
{
- wxFont font(GetBasicStyle().GetFont());
- font.SetPointSize(pointSize);
-
- wxTextAttrEx attr;
- attr.SetFont(font, wxTEXT_ATTR_FONT_SIZE);
+ wxTextAttr attr;
+ attr.SetFontSize(pointSize);
return BeginStyle(attr);
}
/// Begin using this font
bool wxRichTextBuffer::BeginFont(const wxFont& font)
{
- wxTextAttrEx attr;
- attr.SetFlags(wxTEXT_ATTR_FONT);
+ wxTextAttr attr;
attr.SetFont(font);
return BeginStyle(attr);
/// Begin using this colour
bool wxRichTextBuffer::BeginTextColour(const wxColour& colour)
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_TEXT_COLOUR);
attr.SetTextColour(colour);
/// Begin using alignment
bool wxRichTextBuffer::BeginAlignment(wxTextAttrAlignment alignment)
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_ALIGNMENT);
attr.SetAlignment(alignment);
/// Begin left indent
bool wxRichTextBuffer::BeginLeftIndent(int leftIndent, int leftSubIndent)
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_LEFT_INDENT);
attr.SetLeftIndent(leftIndent, leftSubIndent);
/// Begin right indent
bool wxRichTextBuffer::BeginRightIndent(int rightIndent)
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_RIGHT_INDENT);
attr.SetRightIndent(rightIndent);
if (after != 0)
flags |= wxTEXT_ATTR_PARA_SPACING_AFTER;
- wxTextAttrEx attr;
+ wxTextAttr attr;
attr.SetFlags(flags);
attr.SetParagraphSpacingBefore(before);
attr.SetParagraphSpacingAfter(after);
/// Begin line spacing
bool wxRichTextBuffer::BeginLineSpacing(int lineSpacing)
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_LINE_SPACING);
attr.SetLineSpacing(lineSpacing);
/// Begin numbered bullet
bool wxRichTextBuffer::BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle)
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
attr.SetBulletStyle(bulletStyle);
attr.SetBulletNumber(bulletNumber);
/// Begin symbol bullet
bool wxRichTextBuffer::BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle)
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
attr.SetBulletStyle(bulletStyle);
attr.SetLeftIndent(leftIndent, leftSubIndent);
/// Begin standard bullet
bool wxRichTextBuffer::BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle)
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
attr.SetFlags(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_LEFT_INDENT);
attr.SetBulletStyle(bulletStyle);
attr.SetLeftIndent(leftIndent, leftSubIndent);
wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->FindCharacterStyle(characterStyle);
if (def)
{
- wxTextAttrEx attr = def->GetStyleMergedWithBase(GetStyleSheet());
+ wxTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet());
return BeginStyle(attr);
}
}
wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->FindParagraphStyle(paragraphStyle);
if (def)
{
- wxTextAttrEx attr = def->GetStyleMergedWithBase(GetStyleSheet());
+ wxTextAttr attr = def->GetStyleMergedWithBase(GetStyleSheet());
return BeginStyle(attr);
}
}
wxRichTextListStyleDefinition* def = GetStyleSheet()->FindListStyle(listStyle);
if (def)
{
- wxTextAttrEx attr(def->GetCombinedStyleForLevel(level));
+ wxTextAttr attr(def->GetCombinedStyleForLevel(level));
attr.SetBulletNumber(number);
/// Begin URL
bool wxRichTextBuffer::BeginURL(const wxString& url, const wxString& characterStyle)
{
- wxTextAttrEx attr;
+ wxTextAttr attr;
if (!characterStyle.IsEmpty() && GetStyleSheet())
{
}
/// Finds a handler by filename or, if supplied, type
-wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename, int imageType)
+wxRichTextFileHandler *wxRichTextBuffer::FindHandlerFilenameOrType(const wxString& filename,
+ wxRichTextFileType imageType)
{
if (imageType != wxRICHTEXT_TYPE_ANY)
return FindHandler(imageType);
}
/// Finds a handler by extension and type
-wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, int type)
+wxRichTextFileHandler* wxRichTextBuffer::FindHandler(const wxString& extension, wxRichTextFileType type)
{
wxList::compatibility_iterator node = sm_handlers.GetFirst();
while (node)
}
/// Finds a handler by type
-wxRichTextFileHandler* wxRichTextBuffer::FindHandler(int type)
+wxRichTextFileHandler* wxRichTextBuffer::FindHandler(wxRichTextFileType type)
{
wxList::compatibility_iterator node = sm_handlers.GetFirst();
while (node)
while (node)
{
wxRichTextFileHandler* handler = (wxRichTextFileHandler*) node->GetData();
- if (handler->IsVisible() && ((save && handler->CanSave()) || !save && handler->CanLoad()))
+ if (handler->IsVisible() && ((save && handler->CanSave()) || (!save && handler->CanLoad())))
{
if (combine)
{
}
/// Load a file
-bool wxRichTextBuffer::LoadFile(const wxString& filename, int type)
+bool wxRichTextBuffer::LoadFile(const wxString& filename, wxRichTextFileType type)
{
wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
if (handler)
{
- SetDefaultStyle(wxTextAttrEx());
+ SetDefaultStyle(wxTextAttr());
handler->SetFlags(GetHandlerFlags());
bool success = handler->LoadFile(this, filename);
Invalidate(wxRICHTEXT_ALL);
}
/// Save a file
-bool wxRichTextBuffer::SaveFile(const wxString& filename, int type)
+bool wxRichTextBuffer::SaveFile(const wxString& filename, wxRichTextFileType type)
{
wxRichTextFileHandler* handler = FindHandlerFilenameOrType(filename, type);
if (handler)
}
/// Load from a stream
-bool wxRichTextBuffer::LoadFile(wxInputStream& stream, int type)
+bool wxRichTextBuffer::LoadFile(wxInputStream& stream, wxRichTextFileType type)
{
wxRichTextFileHandler* handler = FindHandler(type);
if (handler)
{
- SetDefaultStyle(wxTextAttrEx());
+ SetDefaultStyle(wxTextAttr());
handler->SetFlags(GetHandlerFlags());
bool success = handler->LoadFile(this, stream);
Invalidate(wxRICHTEXT_ALL);
}
/// Save to a stream
-bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, int type)
+bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, wxRichTextFileType type)
{
wxRichTextFileHandler* handler = FindHandler(type);
if (handler)
wxRichTextBuffer* richTextBuffer = data.GetRichTextBuffer();
if (richTextBuffer)
{
- InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
+ InsertParagraphsWithUndo(position+1, *richTextBuffer, GetRichTextCtrl(), 0);
+ if (GetRichTextCtrl())
+ GetRichTextCtrl()->ShowPosition(position + richTextBuffer->GetRange().GetEnd());
delete richTextBuffer;
}
}
wxTextDataObject data;
wxTheClipboard->GetData(data);
wxString text(data.GetText());
- text.Replace(_T("\r\n"), _T("\n"));
+#ifdef __WXMSW__
+ wxString text2;
+ text2.Alloc(text.Length()+1);
+ size_t i;
+ for (i = 0; i < text.Length(); i++)
+ {
+ wxChar ch = text[i];
+ if (ch != wxT('\r'))
+ text2 += ch;
+ }
+#else
+ wxString text2 = text;
+#endif
+ InsertTextWithUndo(position+1, text2, GetRichTextCtrl(), wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
- InsertTextWithUndo(position+1, text, GetRichTextCtrl());
+ if (GetRichTextCtrl())
+ GetRichTextCtrl()->ShowPosition(position + text2.Length());
success = true;
}
if (action->GetNewParagraphs().GetChildCount() == 1)
action->GetNewParagraphs().SetPartialParagraph(true);
- action->SetPosition(position);
+ action->SetPosition(position+1);
// Set the range we'll need to delete in Undo
- action->SetRange(wxRichTextRange(position, position));
+ action->SetRange(wxRichTextRange(position+1, position+1));
SubmitAction(action);
sm_renderer = renderer;
}
-bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttrEx& bulletAttr, const wxRect& rect)
+bool wxRichTextStdRenderer::DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttr& bulletAttr, const wxRect& rect)
{
if (bulletAttr.GetTextColour().Ok())
{
- dc.SetPen(wxPen(bulletAttr.GetTextColour()));
- dc.SetBrush(wxBrush(bulletAttr.GetTextColour()));
+ wxCheckSetPen(dc, wxPen(bulletAttr.GetTextColour()));
+ wxCheckSetBrush(dc, wxBrush(bulletAttr.GetTextColour()));
}
else
{
- dc.SetPen(*wxBLACK_PEN);
- dc.SetBrush(*wxBLACK_BRUSH);
+ wxCheckSetPen(dc, *wxBLACK_PEN);
+ wxCheckSetBrush(dc, *wxBLACK_BRUSH);
}
wxFont font;
- if (bulletAttr.GetFont().Ok())
- font = bulletAttr.GetFont();
+ if (bulletAttr.HasFont())
+ {
+ font = paragraph->GetBuffer()->GetFontTable().FindFont(bulletAttr);
+ }
else
font = (*wxNORMAL_FONT);
- dc.SetFont(font);
+ wxCheckSetFont(dc, font);
int charHeight = dc.GetCharHeight();
return true;
}
-bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttrEx& attr, const wxRect& rect, const wxString& text)
+bool wxRichTextStdRenderer::DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxTextAttr& 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();
+ if ((attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) && !attr.GetBulletFont().IsEmpty() && attr.HasFont())
+ {
+ wxTextAttr fontAttr;
+ fontAttr.SetFontSize(attr.GetFontSize());
+ fontAttr.SetFontStyle(attr.GetFontStyle());
+ fontAttr.SetFontWeight(attr.GetFontWeight());
+ fontAttr.SetFontUnderlined(attr.GetFontUnderlined());
+ fontAttr.SetFontFaceName(attr.GetBulletFont());
+ font = paragraph->GetBuffer()->GetFontTable().FindFont(fontAttr);
+ }
+ else if (attr.HasFont())
+ font = paragraph->GetBuffer()->GetFontTable().FindFont(attr);
else
font = (*wxNORMAL_FONT);
- dc.SetFont(font);
+ wxCheckSetFont(dc, font);
if (attr.GetTextColour().Ok())
dc.SetTextForeground(attr.GetTextColour());
- dc.SetBackgroundMode(wxTRANSPARENT);
+ dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
int charHeight = dc.GetCharHeight();
wxCoord tw, th;
return false;
}
-bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(paragraph), wxDC& WXUNUSED(dc), const wxTextAttrEx& WXUNUSED(attr), const wxRect& WXUNUSED(rect))
+bool wxRichTextStdRenderer::DrawBitmapBullet(wxRichTextParagraph* WXUNUSED(paragraph), wxDC& WXUNUSED(dc), const wxTextAttr& 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.
wxRichTextBuffer::InitStandardHandlers();
wxRichTextParagraph::InitDefaultTabs();
return true;
- };
+ }
void OnExit()
{
wxRichTextBuffer::CleanUpHandlers();
wxRichTextParagraph::ClearDefaultTabs();
wxRichTextCtrl::ClearAvailableFontNames();
wxRichTextBuffer::SetRenderer(NULL);
- };
+ }
};
IMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule)
{
}
+void wxRichTextAction::CalculateRefreshOptimizations(wxArrayInt& optimizationLineCharPositions, wxArrayInt& optimizationLineYPositions)
+{
+ // Store a list of line start character and y positions so we can figure out which area
+ // we need to refresh
+
+#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(GetRange().GetStart());
+ 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
+}
+
bool wxRichTextAction::Do()
{
m_buffer->Modify(true);
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;
+ CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
+#endif
- 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());
+ m_buffer->InsertFragment(GetRange().GetStart(), m_newParagraphs);
+ m_buffer->UpdateRanges();
+ m_buffer->Invalidate(wxRichTextRange(wxMax(0, GetRange().GetStart()-1), GetRange().GetEnd()));
long newCaretPosition = GetPosition() + m_newParagraphs.GetRange().GetLength();
newCaretPosition = wxMin(newCaretPosition, (m_buffer->GetRange().GetEnd()-1));
- if (optimizationLineCharPositions.GetCount() > 0)
- UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions);
- else
- UpdateAppearance(newCaretPosition, true /* send update event */);
+ UpdateAppearance(newCaretPosition, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */);
wxRichTextEvent cmdEvent(
wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED,
}
case wxRICHTEXT_DELETE:
{
+ wxArrayInt optimizationLineCharPositions;
+ wxArrayInt optimizationLineYPositions;
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+ CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
+#endif
+
m_buffer->DeleteRange(GetRange());
m_buffer->UpdateRanges();
m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
- UpdateAppearance(GetRange().GetStart()-1, true /* send update event */);
+ long caretPos = GetRange().GetStart()-1;
+ if (caretPos >= m_buffer->GetRange().GetEnd())
+ caretPos --;
+
+ UpdateAppearance(caretPos, true /* send update event */, & optimizationLineCharPositions, & optimizationLineYPositions, true /* do */);
wxRichTextEvent cmdEvent(
wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,
{
case wxRICHTEXT_INSERT:
{
+ wxArrayInt optimizationLineCharPositions;
+ wxArrayInt optimizationLineYPositions;
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+ CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
+#endif
+
m_buffer->DeleteRange(GetRange());
m_buffer->UpdateRanges();
m_buffer->Invalidate(wxRichTextRange(GetRange().GetStart(), GetRange().GetStart()));
long newCaretPosition = GetPosition() - 1;
- UpdateAppearance(newCaretPosition, true /* send update event */);
+ UpdateAppearance(newCaretPosition, true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */);
wxRichTextEvent cmdEvent(
wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED,
}
case wxRICHTEXT_DELETE:
{
+ wxArrayInt optimizationLineCharPositions;
+ wxArrayInt optimizationLineYPositions;
+
+#if wxRICHTEXT_USE_OPTIMIZED_DRAWING
+ CalculateRefreshOptimizations(optimizationLineCharPositions, optimizationLineYPositions);
+#endif
+
m_buffer->InsertFragment(GetRange().GetStart(), m_oldParagraphs);
m_buffer->UpdateRanges();
m_buffer->Invalidate(GetRange());
- UpdateAppearance(GetPosition(), true /* send update event */);
+ UpdateAppearance(GetPosition(), true, /* send update event */ & optimizationLineCharPositions, & optimizationLineYPositions, false /* undo */);
wxRichTextEvent cmdEvent(
wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED,
}
/// Update the control appearance
-void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* optimizationLineCharPositions, wxArrayInt* optimizationLineYPositions)
+void wxRichTextAction::UpdateAppearance(long caretPosition, bool sendUpdateEvent, wxArrayInt* optimizationLineCharPositions, wxArrayInt* optimizationLineYPositions, bool isDoCmd)
{
if (m_ctrl)
{
if (!m_ctrl->IsFrozen())
{
m_ctrl->LayoutContent();
- m_ctrl->PositionCaret();
#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)
+ if ((m_cmdId == wxRICHTEXT_INSERT || m_cmdId == wxRICHTEXT_DELETE) && optimizationLineCharPositions)
{
size_t i;
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();
+ // Determine whether this is Do or Undo, and adjust positionOffset accordingly
+ if ((m_cmdId == wxRICHTEXT_DELETE && isDoCmd) || (m_cmdId == wxRICHTEXT_INSERT && !isDoCmd))
+ positionOffset = - positionOffset;
+
// 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());
+ if (para)
+ {
+ // Find line containing GetPosition().
+ wxRichTextLine* line = NULL;
+ wxRichTextLineList::compatibility_iterator node2 = para->GetLines().GetFirst();
+ while (node2)
+ {
+ wxRichTextLine* l = node2->GetData();
+ wxRichTextRange range = l->GetAbsoluteRange();
+ if (range.Contains(GetRange().GetStart()-1))
+ {
+ line = l;
+ break;
+ }
+ node2 = node2->GetNext();
+ }
+
+ if (line)
+ {
+ // Step back a couple of lines to where we can be sure of reformatting correctly
+ wxRichTextLineList::compatibility_iterator lineNode = para->GetLines().Find(line);
+ if (lineNode)
+ {
+ lineNode = lineNode->GetPrevious();
+ if (lineNode)
+ {
+ line = (wxRichTextLine*) lineNode->GetData();
+ lineNode = lineNode->GetPrevious();
+ if (lineNode)
+ line = (wxRichTextLine*) lineNode->GetData();
+ }
+ }
+
+ firstY = line->GetAbsolutePosition().y;
+ }
+ }
+
wxRichTextObjectList::compatibility_iterator node = m_buffer->GetChildren().Find(para);
while (node)
{
node2 = wxRichTextLineList::compatibility_iterator();
node = wxRichTextObjectList::compatibility_iterator();
}
- else
+ // Detect last line in the buffer
+ else if (!node2->GetNext() && para->GetRange().Contains(m_buffer->GetRange().GetEnd()))
{
- if (!foundStart)
- {
- firstY = pt.y - firstVisiblePt.y;
- foundStart = true;
- }
+ foundEnd = true;
+ lastY = pt.y + line->GetSize().y;
+
+ node2 = wxRichTextLineList::compatibility_iterator();
+ node = wxRichTextObjectList::compatibility_iterator();
+ break;
+ }
+ else
+ {
// search for this line being at the same position as before
for (i = 0; i < optimizationLineCharPositions->GetCount(); i++)
{
{
// Stop, we're now the same as we were
foundEnd = true;
- lastY = pt.y - firstVisiblePt.y;
+
+ lastY = pt.y;
node2 = wxRichTextLineList::compatibility_iterator();
node = wxRichTextObjectList::compatibility_iterator();
node = node->GetNext();
}
- if (!foundStart)
- firstY = firstVisiblePt.y;
+ firstY = wxMax(firstVisiblePt.y, firstY);
if (!foundEnd)
lastY = firstVisiblePt.y + clientSize.y;
- wxRect rect(firstVisiblePt.x, firstY, firstVisiblePt.x + clientSize.x, lastY - firstY);
+ // Convert to device coordinates
+ wxRect rect(m_ctrl->GetPhysicalPoint(wxPoint(firstVisiblePt.x, firstY)), wxSize(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 wxRICHTEXT_USE_OWN_CARET
+ m_ctrl->PositionCaret();
+#endif
if (sendUpdateEvent)
- m_ctrl->SendTextUpdatedEvent();
+ wxTextCtrl::SendTextUpdatedEvent(m_ctrl);
}
}
}
IMPLEMENT_DYNAMIC_CLASS(wxRichTextImage, wxRichTextObject)
-wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxTextAttrEx* charStyle):
+wxRichTextImage::wxRichTextImage(const wxImage& image, wxRichTextObject* parent, wxTextAttr* charStyle):
wxRichTextObject(parent)
{
m_image = image;
SetAttributes(*charStyle);
}
-wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent, wxTextAttrEx* charStyle):
+wxRichTextImage::wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent, wxTextAttr* charStyle):
wxRichTextObject(parent)
{
m_imageBlock = imageBlock;
if (selectionRange.Contains(range.GetStart()))
{
- dc.SetBrush(*wxBLACK_BRUSH);
- dc.SetPen(*wxBLACK_PEN);
+ wxCheckSetBrush(dc, *wxBLACK_BRUSH);
+ wxCheckSetPen(dc, *wxBLACK_PEN);
dc.SetLogicalFunction(wxINVERT);
dc.DrawRectangle(rect);
dc.SetLogicalFunction(wxCOPY);
/// Get/set the object size for the given range. Returns false if the range
/// is invalid for this object.
-bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& WXUNUSED(dc), int WXUNUSED(flags), wxPoint WXUNUSED(position)) const
+bool wxRichTextImage::GetRangeSize(const wxRichTextRange& range, wxSize& size, int& WXUNUSED(descent), wxDC& WXUNUSED(dc), int WXUNUSED(flags), wxPoint WXUNUSED(position), wxArrayInt* partialExtents) const
{
if (!range.IsWithin(GetRange()))
return false;
+ if (!m_image.Ok())
+ ((wxRichTextImage*) this)->LoadFromBlock();
+
+ if (partialExtents)
+ {
+ if (m_image.Ok())
+ partialExtents->Add(m_image.GetWidth());
+ else
+ partialExtents->Add(0);
+ }
+
if (!m_image.Ok())
return false;
*/
/// Compare two attribute objects
-bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2)
+bool wxTextAttrEq(const wxTextAttr& attr1, const wxTextAttr& attr2)
{
return (attr1 == attr2);
}
-bool wxTextAttrEq(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2)
-{
- return (
- attr1.GetTextColour() == attr2.GetTextColour() &&
- attr1.GetBackgroundColour() == attr2.GetBackgroundColour() &&
- attr1.GetFont().GetPointSize() == attr2.GetFontSize() &&
- attr1.GetFont().GetStyle() == attr2.GetFontStyle() &&
- attr1.GetFont().GetWeight() == attr2.GetFontWeight() &&
- attr1.GetFont().GetFaceName() == attr2.GetFontFaceName() &&
- attr1.GetFont().GetUnderlined() == attr2.GetFontUnderlined() &&
- attr1.GetTextEffects() == attr2.GetTextEffects() &&
- attr1.GetTextEffectFlags() == attr2.GetTextEffectFlags() &&
- attr1.GetAlignment() == attr2.GetAlignment() &&
- attr1.GetLeftIndent() == attr2.GetLeftIndent() &&
- attr1.GetRightIndent() == attr2.GetRightIndent() &&
- attr1.GetLeftSubIndent() == attr2.GetLeftSubIndent() &&
- wxRichTextTabsEq(attr1.GetTabs(), attr2.GetTabs()) &&
- attr1.GetLineSpacing() == attr2.GetLineSpacing() &&
- attr1.GetParagraphSpacingAfter() == attr2.GetParagraphSpacingAfter() &&
- attr1.GetParagraphSpacingBefore() == attr2.GetParagraphSpacingBefore() &&
- attr1.GetBulletStyle() == attr2.GetBulletStyle() &&
- attr1.GetBulletNumber() == attr2.GetBulletNumber() &&
- attr1.GetBulletText() == attr2.GetBulletText() &&
- attr1.GetBulletName() == attr2.GetBulletName() &&
- attr1.GetBulletFont() == attr2.GetBulletFont() &&
- attr1.GetOutlineLevel() == attr2.GetOutlineLevel() &&
- attr1.GetCharacterStyleName() == attr2.GetCharacterStyleName() &&
- attr1.GetParagraphStyleName() == attr2.GetParagraphStyleName() &&
- attr1.GetListStyleName() == attr2.GetListStyleName() &&
- attr1.HasPageBreak() == attr2.HasPageBreak());
-}
-
-/// Compare two attribute objects, but take into account the flags
-/// specifying attributes of interest.
-bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxTextAttrEx& attr2, int flags)
-{
- if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && attr1.GetTextColour() != attr2.GetTextColour())
- return false;
-
- if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && attr1.GetBackgroundColour() != attr2.GetBackgroundColour())
- return false;
-
- if ((flags & wxTEXT_ATTR_FONT_FACE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
- attr1.GetFont().GetFaceName() != attr2.GetFont().GetFaceName())
- return false;
-
- if ((flags & wxTEXT_ATTR_FONT_SIZE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
- attr1.GetFont().GetPointSize() != attr2.GetFont().GetPointSize())
- return false;
-
- if ((flags & wxTEXT_ATTR_FONT_WEIGHT) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
- attr1.GetFont().GetWeight() != attr2.GetFont().GetWeight())
- return false;
-
- if ((flags & wxTEXT_ATTR_FONT_ITALIC) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
- attr1.GetFont().GetStyle() != attr2.GetFont().GetStyle())
- return false;
-
- if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) && attr1.GetFont().Ok() && attr2.GetFont().Ok() &&
- attr1.GetFont().GetUnderlined() != attr2.GetFont().GetUnderlined())
- return false;
-
- if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment())
- return false;
-
- if ((flags & wxTEXT_ATTR_LEFT_INDENT) &&
- ((attr1.GetLeftIndent() != attr2.GetLeftIndent()) || (attr1.GetLeftSubIndent() != attr2.GetLeftSubIndent())))
- return false;
-
- if ((flags & wxTEXT_ATTR_RIGHT_INDENT) &&
- (attr1.GetRightIndent() != attr2.GetRightIndent()))
- return false;
-
- if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) &&
- (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter()))
- return false;
-
- if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) &&
- (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore()))
- return false;
-
- if ((flags & wxTEXT_ATTR_LINE_SPACING) &&
- (attr1.GetLineSpacing() != attr2.GetLineSpacing()))
- return false;
-
- if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&
- (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName()))
- return false;
-
- if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&
- (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName()))
- return false;
-
- if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) &&
- (attr1.GetListStyleName() != attr2.GetListStyleName()))
- return false;
-
- if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
- (attr1.GetBulletStyle() != attr2.GetBulletStyle()))
- return false;
-
- if ((flags & wxTEXT_ATTR_BULLET_NUMBER) &&
- (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
- return false;
-
- if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
- (attr1.GetBulletText() != attr2.GetBulletText()) &&
- (attr1.GetBulletFont() != attr2.GetBulletFont()))
- return false;
-
- 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;
-
- if (flags & wxTEXT_ATTR_EFFECTS)
- {
- if (attr1.HasTextEffects() != attr2.HasTextEffects())
- return false;
- if (!wxRichTextBitlistsEqPartial(attr1.GetTextEffects(), attr2.GetTextEffects(), attr2.GetTextEffectFlags()))
- return false;
- }
-
- if ((flags & wxTEXT_ATTR_OUTLINE_LEVEL) &&
- (attr1.GetOutlineLevel() != attr2.GetOutlineLevel()))
- return false;
-
- return true;
-}
-
-bool wxTextAttrEqPartial(const wxTextAttrEx& attr1, const wxRichTextAttr& attr2, int flags)
+// Partial equality test taking flags into account
+bool wxTextAttrEqPartial(const wxTextAttr& attr1, const wxTextAttr& attr2, int flags)
{
- if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && attr1.GetTextColour() != attr2.GetTextColour())
- return false;
-
- if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && attr1.GetBackgroundColour() != attr2.GetBackgroundColour())
- return false;
-
- if ((flags & (wxTEXT_ATTR_FONT)) && !attr1.GetFont().Ok())
- return false;
-
- if ((flags & wxTEXT_ATTR_FONT_FACE) && attr1.GetFont().Ok() &&
- attr1.GetFont().GetFaceName() != attr2.GetFontFaceName())
- return false;
-
- if ((flags & wxTEXT_ATTR_FONT_SIZE) && attr1.GetFont().Ok() &&
- attr1.GetFont().GetPointSize() != attr2.GetFontSize())
- return false;
-
- if ((flags & wxTEXT_ATTR_FONT_WEIGHT) && attr1.GetFont().Ok() &&
- attr1.GetFont().GetWeight() != attr2.GetFontWeight())
- return false;
-
- if ((flags & wxTEXT_ATTR_FONT_ITALIC) && attr1.GetFont().Ok() &&
- attr1.GetFont().GetStyle() != attr2.GetFontStyle())
- return false;
-
- if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) && attr1.GetFont().Ok() &&
- attr1.GetFont().GetUnderlined() != attr2.GetFontUnderlined())
- return false;
-
- if ((flags & wxTEXT_ATTR_ALIGNMENT) && attr1.GetAlignment() != attr2.GetAlignment())
- return false;
-
- if ((flags & wxTEXT_ATTR_LEFT_INDENT) &&
- ((attr1.GetLeftIndent() != attr2.GetLeftIndent()) || (attr1.GetLeftSubIndent() != attr2.GetLeftSubIndent())))
- return false;
-
- if ((flags & wxTEXT_ATTR_RIGHT_INDENT) &&
- (attr1.GetRightIndent() != attr2.GetRightIndent()))
- return false;
-
- if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) &&
- (attr1.GetParagraphSpacingAfter() != attr2.GetParagraphSpacingAfter()))
- return false;
-
- if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) &&
- (attr1.GetParagraphSpacingBefore() != attr2.GetParagraphSpacingBefore()))
- return false;
-
- if ((flags & wxTEXT_ATTR_LINE_SPACING) &&
- (attr1.GetLineSpacing() != attr2.GetLineSpacing()))
- return false;
-
- if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&
- (attr1.GetCharacterStyleName() != attr2.GetCharacterStyleName()))
- return false;
-
- if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&
- (attr1.GetParagraphStyleName() != attr2.GetParagraphStyleName()))
- return false;
-
- if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) &&
- (attr1.GetListStyleName() != attr2.GetListStyleName()))
- return false;
-
- if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
- (attr1.GetBulletStyle() != attr2.GetBulletStyle()))
- return false;
-
- if ((flags & wxTEXT_ATTR_BULLET_NUMBER) &&
- (attr1.GetBulletNumber() != attr2.GetBulletNumber()))
- return false;
-
- if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
- (attr1.GetBulletText() != attr2.GetBulletText()) &&
- (attr1.GetBulletFont() != attr2.GetBulletFont()))
- return false;
-
- 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;
-
- if (flags & wxTEXT_ATTR_EFFECTS)
- {
- if (attr1.HasTextEffects() != attr2.HasTextEffects())
- return false;
- if (!wxRichTextBitlistsEqPartial(attr1.GetTextEffects(), attr2.GetTextEffects(), attr2.GetTextEffectFlags()))
- return false;
- }
-
- if ((flags & wxTEXT_ATTR_OUTLINE_LEVEL) &&
- (attr1.GetOutlineLevel() != attr2.GetOutlineLevel()))
- return false;
-
- return true;
+ return attr1.EqPartial(attr2, flags);
}
/// Compare tabs
return true;
}
-/// Apply one style to another
-bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxTextAttrEx& style)
-{
- // Whole font
- if (style.GetFont().Ok() && ((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT)))
- destStyle.SetFont(style.GetFont());
- else if (style.GetFont().Ok())
- {
- wxFont font = destStyle.GetFont();
-
- if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)
- {
- destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE);
- font.SetFaceName(style.GetFont().GetFaceName());
- }
-
- if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)
- {
- destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);
- font.SetPointSize(style.GetFont().GetPointSize());
- }
-
- if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC)
- {
- destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC);
- font.SetStyle(style.GetFont().GetStyle());
- }
-
- if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)
- {
- destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);
- font.SetWeight(style.GetFont().GetWeight());
- }
-
- if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)
- {
- destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE);
- font.SetUnderlined(style.GetFont().GetUnderlined());
- }
-
- if (font != destStyle.GetFont())
- {
- int oldFlags = destStyle.GetFlags();
-
- destStyle.SetFont(font);
-
- destStyle.SetFlags(oldFlags);
- }
- }
-
- if ( style.GetTextColour().Ok() && style.HasTextColour())
- destStyle.SetTextColour(style.GetTextColour());
-
- if ( style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
- destStyle.SetBackgroundColour(style.GetBackgroundColour());
-
- if (style.HasAlignment())
- destStyle.SetAlignment(style.GetAlignment());
-
- if (style.HasTabs())
- destStyle.SetTabs(style.GetTabs());
-
- if (style.HasLeftIndent())
- destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
-
- if (style.HasRightIndent())
- destStyle.SetRightIndent(style.GetRightIndent());
-
- if (style.HasParagraphSpacingAfter())
- destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
-
- if (style.HasParagraphSpacingBefore())
- destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
-
- if (style.HasLineSpacing())
- destStyle.SetLineSpacing(style.GetLineSpacing());
-
- if (style.HasCharacterStyleName())
- destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
-
- if (style.HasParagraphStyleName())
- destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
-
- if (style.HasListStyleName())
- destStyle.SetListStyleName(style.GetListStyleName());
-
- if (style.HasBulletStyle())
- destStyle.SetBulletStyle(style.GetBulletStyle());
-
- 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();
-
- if (style.HasTextEffects())
- {
- int destBits = destStyle.GetTextEffects();
- int destFlags = destStyle.GetTextEffectFlags();
-
- int srcBits = style.GetTextEffects();
- int srcFlags = style.GetTextEffectFlags();
-
- wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
-
- destStyle.SetTextEffects(destBits);
- destStyle.SetTextEffectFlags(destFlags);
- }
-
- if (style.HasOutlineLevel())
- destStyle.SetOutlineLevel(style.GetOutlineLevel());
-
- return true;
-}
-
-bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxTextAttrEx& style)
+bool wxRichTextApplyStyle(wxTextAttr& destStyle, const wxTextAttr& style, wxTextAttr* compareWith)
{
- wxTextAttrEx destStyle2 = destStyle;
- wxRichTextApplyStyle(destStyle2, style);
- destStyle = destStyle2;
- return true;
-}
-
-bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
-{
- destStyle = destStyle.Combine(style, compareWith);
- return true;
-}
-
-bool wxRichTextApplyStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith)
-{
- // Whole font. Avoiding setting individual attributes if possible, since
- // it recreates the font each time.
- if (((style.GetFlags() & (wxTEXT_ATTR_FONT)) == (wxTEXT_ATTR_FONT)) && !compareWith)
- {
- destStyle.SetFont(wxFont(style.GetFontSize(), destStyle.GetFont().Ok() ? destStyle.GetFont().GetFamily() : wxDEFAULT,
- style.GetFontStyle(), style.GetFontWeight(), style.GetFontUnderlined(), style.GetFontFaceName()));
- }
- else if (style.GetFlags() & (wxTEXT_ATTR_FONT))
- {
- wxFont font = destStyle.GetFont();
-
- if (style.GetFlags() & wxTEXT_ATTR_FONT_FACE)
- {
- if (compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName())
- {
- // The same as currently displayed, so don't set
- }
- else
- {
- destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_FACE);
- font.SetFaceName(style.GetFontFaceName());
- }
- }
-
- if (style.GetFlags() & wxTEXT_ATTR_FONT_SIZE)
- {
- if (compareWith && compareWith->HasFontSize() && compareWith->GetFontSize() == style.GetFontSize())
- {
- // The same as currently displayed, so don't set
- }
- else
- {
- destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_SIZE);
- font.SetPointSize(style.GetFontSize());
- }
- }
-
- if (style.GetFlags() & wxTEXT_ATTR_FONT_ITALIC)
- {
- if (compareWith && compareWith->HasFontItalic() && compareWith->GetFontStyle() == style.GetFontStyle())
- {
- // The same as currently displayed, so don't set
- }
- else
- {
- destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_ITALIC);
- font.SetStyle(style.GetFontStyle());
- }
- }
-
- if (style.GetFlags() & wxTEXT_ATTR_FONT_WEIGHT)
- {
- if (compareWith && compareWith->HasFontWeight() && compareWith->GetFontWeight() == style.GetFontWeight())
- {
- // The same as currently displayed, so don't set
- }
- else
- {
- destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);
- font.SetWeight(style.GetFontWeight());
- }
- }
-
- if (style.GetFlags() & wxTEXT_ATTR_FONT_UNDERLINE)
- {
- if (compareWith && compareWith->HasFontUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined())
- {
- // The same as currently displayed, so don't set
- }
- else
- {
- destStyle.SetFlags(destStyle.GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE);
- font.SetUnderlined(style.GetFontUnderlined());
- }
- }
-
- if (font != destStyle.GetFont())
- {
- int oldFlags = destStyle.GetFlags();
-
- destStyle.SetFont(font);
-
- destStyle.SetFlags(oldFlags);
- }
- }
-
- if (style.GetTextColour().Ok() && style.HasTextColour())
- {
- if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour()))
- destStyle.SetTextColour(style.GetTextColour());
- }
-
- if (style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
- {
- if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour()))
- destStyle.SetBackgroundColour(style.GetBackgroundColour());
- }
-
- if (style.HasAlignment())
- {
- if (!(compareWith && compareWith->HasAlignment() && compareWith->GetAlignment() == style.GetAlignment()))
- destStyle.SetAlignment(style.GetAlignment());
- }
-
- if (style.HasTabs())
- {
- if (!(compareWith && compareWith->HasTabs() && wxRichTextTabsEq(compareWith->GetTabs(), style.GetTabs())))
- destStyle.SetTabs(style.GetTabs());
- }
-
- if (style.HasLeftIndent())
- {
- if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent()
- && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent()))
- destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
- }
-
- if (style.HasRightIndent())
- {
- if (!(compareWith && compareWith->HasRightIndent() && compareWith->GetRightIndent() == style.GetRightIndent()))
- destStyle.SetRightIndent(style.GetRightIndent());
- }
-
- if (style.HasParagraphSpacingAfter())
- {
- if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter()))
- destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
- }
-
- if (style.HasParagraphSpacingBefore())
- {
- if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore()))
- destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
- }
-
- if (style.HasLineSpacing())
- {
- if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing()))
- destStyle.SetLineSpacing(style.GetLineSpacing());
- }
-
- if (style.HasCharacterStyleName())
- {
- if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName()))
- destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
- }
-
- if (style.HasParagraphStyleName())
- {
- if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName()))
- destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
- }
-
- if (style.HasListStyleName())
- {
- if (!(compareWith && compareWith->HasListStyleName() && compareWith->GetListStyleName() == style.GetListStyleName()))
- destStyle.SetListStyleName(style.GetListStyleName());
- }
-
- if (style.HasBulletStyle())
- {
- if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle()))
- destStyle.SetBulletStyle(style.GetBulletStyle());
- }
-
- if (style.HasBulletText())
- {
- if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText()))
- {
- destStyle.SetBulletText(style.GetBulletText());
- destStyle.SetBulletFont(style.GetBulletFont());
- }
- }
-
- if (style.HasBulletNumber())
- {
- if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber()))
- 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();
- }
-
- if (style.HasTextEffects())
- {
- if (!(compareWith && compareWith->HasTextEffects() && compareWith->GetTextEffects() == style.GetTextEffects()))
- {
- int destBits = destStyle.GetTextEffects();
- int destFlags = destStyle.GetTextEffectFlags();
-
- int srcBits = style.GetTextEffects();
- int srcFlags = style.GetTextEffectFlags();
-
- wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
-
- destStyle.SetTextEffects(destBits);
- destStyle.SetTextEffectFlags(destFlags);
- }
- }
-
- if (style.HasOutlineLevel())
- {
- if (!(compareWith && compareWith->HasOutlineLevel() && compareWith->GetOutlineLevel() == style.GetOutlineLevel()))
- destStyle.SetOutlineLevel(style.GetOutlineLevel());
- }
-
- return true;
+ return destStyle.Apply(style, compareWith);
}
// Remove attributes
-bool wxRichTextRemoveStyle(wxTextAttrEx& destStyle, const wxRichTextAttr& style)
+bool wxRichTextRemoveStyle(wxTextAttr& destStyle, const wxTextAttr& style)
{
- int flags = style.GetFlags();
- int destFlags = destStyle.GetFlags();
-
- destStyle.SetFlags(destFlags & ~flags);
-
- return true;
+ return wxTextAttr::RemoveStyle(destStyle, style);
}
/// Combine two bitlists, specifying the bits of interest with separate flags.
bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB)
-{
- // We want to apply B's bits to A, taking into account each's flags which indicate which bits
- // are to be taken into account. A zero in B's bits should reset that bit in A but only if B's flags
- // indicate it.
-
- // First, reset the 0 bits from B. We make a mask so we're only dealing with B's zero
- // bits at this point, ignoring any 1 bits in B or 0 bits in B that are not relevant.
- int valueA2 = ~(~valueB & flagsB) & valueA;
-
- // Now combine the 1 bits.
- int valueA3 = (valueB & flagsB) | valueA2;
-
- valueA = valueA3;
- flagsA = (flagsA | flagsB);
-
- return true;
+{
+ return wxTextAttr::CombineBitlists(valueA, valueB, flagsA, flagsB);
}
/// Compare two bitlists
bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags)
{
- int relevantBitsA = valueA & flags;
- int relevantBitsB = valueB & flags;
- return (relevantBitsA != relevantBitsB);
+ return wxTextAttr::BitlistsEqPartial(valueA, valueB, flags);
}
/// 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;
-}
-
-void wxSetFontPreservingStyles(wxTextAttr& attr, const wxFont& font)
+bool wxRichTextSplitParaCharStyles(const wxTextAttr& style, wxTextAttr& parStyle, wxTextAttr& charStyle)
{
- long flags = attr.GetFlags();
- attr.SetFont(font);
- attr.SetFlags(flags);
+ return wxTextAttr::SplitParaCharStyles(style, parStyle, charStyle);
}
/// Convert a decimal to Roman numerals
return roman;
}
-/*!
- * wxRichTextAttr stores attributes without a wxFont object, so is a much more
- * efficient way to query styles.
- */
-
-// ctors
-wxRichTextAttr::wxRichTextAttr(const wxColour& colText,
- const wxColour& colBack,
- wxTextAttrAlignment alignment): m_textAlignment(alignment), m_colText(colText), m_colBack(colBack)
-{
- Init();
-
- if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR;
- if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR;
- if (alignment != wxTEXT_ALIGNMENT_DEFAULT)
- m_flags |= wxTEXT_ATTR_ALIGNMENT;
-}
-
-wxRichTextAttr::wxRichTextAttr(const wxTextAttrEx& attr)
-{
- Init();
-
- (*this) = attr;
-}
-
-wxRichTextAttr::wxRichTextAttr(const wxRichTextAttr& attr)
-{
- Copy(attr);
-}
-
-// operations
-void wxRichTextAttr::Init()
-{
- m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT;
- m_flags = 0;
- m_leftIndent = 0;
- m_leftSubIndent = 0;
- m_rightIndent = 0;
-
- m_fontSize = 12;
- m_fontStyle = wxNORMAL;
- m_fontWeight = wxNORMAL;
- m_fontUnderlined = false;
-
- m_paragraphSpacingAfter = 0;
- m_paragraphSpacingBefore = 0;
- m_lineSpacing = 0;
- m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
- m_textEffects = wxTEXT_ATTR_EFFECT_NONE;
- m_textEffectFlags = wxTEXT_ATTR_EFFECT_NONE;
- m_outlineLevel = 0;
- m_bulletNumber = 0;
-}
-
-// Copy
-void wxRichTextAttr::Copy(const wxRichTextAttr& attr)
-{
- m_colText = attr.m_colText;
- m_colBack = attr.m_colBack;
- m_textAlignment = attr.m_textAlignment;
- m_leftIndent = attr.m_leftIndent;
- m_leftSubIndent = attr.m_leftSubIndent;
- m_rightIndent = attr.m_rightIndent;
- m_tabs = attr.m_tabs;
- m_flags = attr.m_flags;
-
- 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_textEffects = attr.m_textEffects;
- m_textEffectFlags = attr.m_textEffectFlags;
-
- m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter;
- m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore;
- m_lineSpacing = attr.m_lineSpacing;
- m_characterStyleName = attr.m_characterStyleName;
- m_paragraphStyleName = attr.m_paragraphStyleName;
- m_listStyleName = attr.m_listStyleName;
- m_bulletStyle = attr.m_bulletStyle;
- m_bulletNumber = attr.m_bulletNumber;
- m_bulletText = attr.m_bulletText;
- m_bulletFont = attr.m_bulletFont;
- m_bulletName = attr.m_bulletName;
- m_outlineLevel = attr.m_outlineLevel;
-
- m_urlTarget = attr.m_urlTarget;
-}
-
-// operators
-void wxRichTextAttr::operator= (const wxRichTextAttr& attr)
-{
- Copy(attr);
-}
-
-// operators
-void wxRichTextAttr::operator= (const wxTextAttrEx& attr)
-{
- m_flags = attr.GetFlags();
-
- m_colText = attr.GetTextColour();
- m_colBack = attr.GetBackgroundColour();
- m_textAlignment = attr.GetAlignment();
- m_leftIndent = attr.GetLeftIndent();
- m_leftSubIndent = attr.GetLeftSubIndent();
- m_rightIndent = attr.GetRightIndent();
- m_tabs = attr.GetTabs();
- m_textEffects = attr.GetTextEffects();
- m_textEffectFlags = attr.GetTextEffectFlags();
-
- m_paragraphSpacingAfter = attr.GetParagraphSpacingAfter();
- m_paragraphSpacingBefore = attr.GetParagraphSpacingBefore();
- m_lineSpacing = attr.GetLineSpacing();
- m_characterStyleName = attr.GetCharacterStyleName();
- m_paragraphStyleName = attr.GetParagraphStyleName();
- m_listStyleName = attr.GetListStyleName();
- m_bulletStyle = attr.GetBulletStyle();
- m_bulletNumber = attr.GetBulletNumber();
- m_bulletText = attr.GetBulletText();
- m_bulletName = attr.GetBulletName();
- m_bulletFont = attr.GetBulletFont();
- m_outlineLevel = attr.GetOutlineLevel();
-
- m_urlTarget = attr.GetURL();
-
- if (attr.GetFont().Ok())
- GetFontAttributes(attr.GetFont());
-}
-
-// Making a wxTextAttrEx object.
-wxRichTextAttr::operator wxTextAttrEx () const
-{
- wxTextAttrEx attr;
- attr.SetTextColour(GetTextColour());
- attr.SetBackgroundColour(GetBackgroundColour());
- attr.SetAlignment(GetAlignment());
- attr.SetTabs(GetTabs());
- attr.SetLeftIndent(GetLeftIndent(), GetLeftSubIndent());
- attr.SetRightIndent(GetRightIndent());
- attr.SetFont(CreateFont());
-
- attr.SetParagraphSpacingAfter(m_paragraphSpacingAfter);
- attr.SetParagraphSpacingBefore(m_paragraphSpacingBefore);
- attr.SetLineSpacing(m_lineSpacing);
- attr.SetBulletStyle(m_bulletStyle);
- attr.SetBulletNumber(m_bulletNumber);
- 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.SetTextEffects(m_textEffects);
- attr.SetTextEffectFlags(m_textEffectFlags);
- attr.SetOutlineLevel(m_outlineLevel);
-
- attr.SetURL(m_urlTarget);
-
- attr.SetFlags(GetFlags()); // Important: set after SetFont and others, since they set flags
- return attr;
-}
-
-// Equality test
-bool wxRichTextAttr::operator== (const wxRichTextAttr& attr) const
-{
- return GetFlags() == attr.GetFlags() &&
-
- GetTextColour() == attr.GetTextColour() &&
- GetBackgroundColour() == attr.GetBackgroundColour() &&
-
- GetAlignment() == attr.GetAlignment() &&
- GetLeftIndent() == attr.GetLeftIndent() &&
- GetLeftSubIndent() == attr.GetLeftSubIndent() &&
- GetRightIndent() == attr.GetRightIndent() &&
- wxRichTextTabsEq(GetTabs(), attr.GetTabs()) &&
-
- GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() &&
- GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() &&
- GetLineSpacing() == attr.GetLineSpacing() &&
- GetCharacterStyleName() == attr.GetCharacterStyleName() &&
- GetParagraphStyleName() == attr.GetParagraphStyleName() &&
- GetListStyleName() == attr.GetListStyleName() &&
-
- GetBulletStyle() == attr.GetBulletStyle() &&
- GetBulletText() == attr.GetBulletText() &&
- GetBulletNumber() == attr.GetBulletNumber() &&
- GetBulletFont() == attr.GetBulletFont() &&
- GetBulletName() == attr.GetBulletName() &&
-
- GetTextEffects() == attr.GetTextEffects() &&
- GetTextEffectFlags() == attr.GetTextEffectFlags() &&
-
- GetOutlineLevel() == attr.GetOutlineLevel() &&
-
- GetFontSize() == attr.GetFontSize() &&
- GetFontStyle() == attr.GetFontStyle() &&
- GetFontWeight() == attr.GetFontWeight() &&
- GetFontUnderlined() == attr.GetFontUnderlined() &&
- GetFontFaceName() == attr.GetFontFaceName() &&
-
- GetURL() == attr.GetURL();
-}
-
-// Create font from font attributes.
-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;
-}
-
-// Get attributes from font.
-bool wxRichTextAttr::GetFontAttributes(const wxFont& font)
-{
- if (!font.Ok())
- return false;
-
- m_fontSize = font.GetPointSize();
- m_fontStyle = font.GetStyle();
- m_fontWeight = font.GetWeight();
- m_fontUnderlined = font.GetUnderlined();
- m_fontFaceName = font.GetFaceName();
-
- return true;
-}
-
-wxRichTextAttr wxRichTextAttr::Combine(const wxRichTextAttr& style, const wxRichTextAttr* compareWith) const
-{
- wxRichTextAttr destStyle = (*this);
- destStyle.Apply(style, compareWith);
-
- return destStyle;
-}
-
-bool wxRichTextAttr::Apply(const wxRichTextAttr& style, const wxRichTextAttr* compareWith)
-{
- wxRichTextAttr& destStyle = (*this);
-
- if (style.HasFontWeight())
- {
- if (!(compareWith && compareWith->HasFontWeight() && compareWith->GetFontWeight() == style.GetFontWeight()))
- destStyle.SetFontWeight(style.GetFontWeight());
- }
-
- if (style.HasFontSize())
- {
- if (!(compareWith && compareWith->HasFontSize() && compareWith->GetFontSize() == style.GetFontSize()))
- destStyle.SetFontSize(style.GetFontSize());
- }
-
- if (style.HasFontItalic())
- {
- if (!(compareWith && compareWith->HasFontItalic() && compareWith->GetFontStyle() == style.GetFontStyle()))
- destStyle.SetFontStyle(style.GetFontStyle());
- }
-
- if (style.HasFontUnderlined())
- {
- if (!(compareWith && compareWith->HasFontUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined()))
- destStyle.SetFontUnderlined(style.GetFontUnderlined());
- }
-
- if (style.HasFontFaceName())
- {
- if (!(compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName()))
- destStyle.SetFontFaceName(style.GetFontFaceName());
- }
-
- if (style.GetTextColour().Ok() && style.HasTextColour())
- {
- if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour()))
- destStyle.SetTextColour(style.GetTextColour());
- }
-
- if (style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
- {
- if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour()))
- destStyle.SetBackgroundColour(style.GetBackgroundColour());
- }
-
- if (style.HasAlignment())
- {
- if (!(compareWith && compareWith->HasAlignment() && compareWith->GetAlignment() == style.GetAlignment()))
- destStyle.SetAlignment(style.GetAlignment());
- }
-
- if (style.HasTabs())
- {
- if (!(compareWith && compareWith->HasTabs() && wxRichTextTabsEq(compareWith->GetTabs(), style.GetTabs())))
- destStyle.SetTabs(style.GetTabs());
- }
-
- if (style.HasLeftIndent())
- {
- if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent()
- && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent()))
- destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
- }
-
- if (style.HasRightIndent())
- {
- if (!(compareWith && compareWith->HasRightIndent() && compareWith->GetRightIndent() == style.GetRightIndent()))
- destStyle.SetRightIndent(style.GetRightIndent());
- }
-
- if (style.HasParagraphSpacingAfter())
- {
- if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter()))
- destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
- }
-
- if (style.HasParagraphSpacingBefore())
- {
- if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore()))
- destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
- }
-
- if (style.HasLineSpacing())
- {
- if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing()))
- destStyle.SetLineSpacing(style.GetLineSpacing());
- }
-
- if (style.HasCharacterStyleName())
- {
- if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName()))
- destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
- }
-
- if (style.HasParagraphStyleName())
- {
- if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName()))
- destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
- }
-
- if (style.HasListStyleName())
- {
- if (!(compareWith && compareWith->HasListStyleName() && compareWith->GetListStyleName() == style.GetListStyleName()))
- destStyle.SetListStyleName(style.GetListStyleName());
- }
-
- if (style.HasBulletStyle())
- {
- if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle()))
- destStyle.SetBulletStyle(style.GetBulletStyle());
- }
-
- if (style.HasBulletText())
- {
- if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText()))
- {
- destStyle.SetBulletText(style.GetBulletText());
- destStyle.SetBulletFont(style.GetBulletFont());
- }
- }
-
- if (style.HasBulletNumber())
- {
- if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber()))
- 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();
- }
-
- if (style.HasTextEffects())
- {
- if (!(compareWith && compareWith->HasTextEffects() && compareWith->GetTextEffects() == style.GetTextEffects()))
- {
- int destBits = destStyle.GetTextEffects();
- int destFlags = destStyle.GetTextEffectFlags();
-
- int srcBits = style.GetTextEffects();
- int srcFlags = style.GetTextEffectFlags();
-
- wxRichTextCombineBitlists(destBits, srcBits, destFlags, srcFlags);
-
- destStyle.SetTextEffects(destBits);
- destStyle.SetTextEffectFlags(destFlags);
- }
- }
-
- if (style.HasOutlineLevel())
- {
- if (!(compareWith && compareWith->HasOutlineLevel() && compareWith->GetOutlineLevel() == style.GetOutlineLevel()))
- destStyle.SetOutlineLevel(style.GetOutlineLevel());
- }
-
- return true;
-}
-
-/*!
- * wxTextAttrEx is an extended version of wxTextAttr with more paragraph attributes.
- */
-
-wxTextAttrEx::wxTextAttrEx(const wxTextAttrEx& attr): wxTextAttr()
-{
- Copy(attr);
-}
-
-// Initialise this object.
-void wxTextAttrEx::Init()
-{
- m_paragraphSpacingAfter = 0;
- m_paragraphSpacingBefore = 0;
- m_lineSpacing = 0;
- m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
- m_textEffects = wxTEXT_ATTR_EFFECT_NONE;
- m_textEffectFlags = wxTEXT_ATTR_EFFECT_NONE;
- m_bulletNumber = 0;
- m_outlineLevel = 0;
-}
-
-// Copy
-void wxTextAttrEx::Copy(const wxTextAttrEx& attr)
-{
- wxTextAttr::operator= (attr);
-
- m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter;
- m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore;
- m_lineSpacing = attr.m_lineSpacing;
- m_characterStyleName = attr.m_characterStyleName;
- m_paragraphStyleName = attr.m_paragraphStyleName;
- m_listStyleName = attr.m_listStyleName;
- m_bulletStyle = attr.m_bulletStyle;
- m_bulletNumber = attr.m_bulletNumber;
- m_bulletText = attr.m_bulletText;
- m_bulletFont = attr.m_bulletFont;
- m_bulletName = attr.m_bulletName;
- m_urlTarget = attr.m_urlTarget;
- m_textEffects = attr.m_textEffects;
- m_textEffectFlags = attr.m_textEffectFlags;
- m_outlineLevel = attr.m_outlineLevel;
-}
-
-// Assignment from a wxTextAttrEx object
-void wxTextAttrEx::operator= (const wxTextAttrEx& attr)
-{
- Copy(attr);
-}
-
-// Assignment from a wxTextAttr object.
-void wxTextAttrEx::operator= (const wxTextAttr& attr)
-{
- wxTextAttr::operator= (attr);
-}
-
-// Equality test
-bool wxTextAttrEx::operator== (const wxTextAttrEx& attr) const
-{
- return (
- GetFlags() == attr.GetFlags() &&
- GetTextColour() == attr.GetTextColour() &&
- GetBackgroundColour() == attr.GetBackgroundColour() &&
- GetFont() == attr.GetFont() &&
- GetTextEffects() == attr.GetTextEffects() &&
- GetTextEffectFlags() == attr.GetTextEffectFlags() &&
- GetAlignment() == attr.GetAlignment() &&
- GetLeftIndent() == attr.GetLeftIndent() &&
- GetRightIndent() == attr.GetRightIndent() &&
- GetLeftSubIndent() == attr.GetLeftSubIndent() &&
- wxRichTextTabsEq(GetTabs(), attr.GetTabs()) &&
- GetLineSpacing() == attr.GetLineSpacing() &&
- GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() &&
- GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() &&
- GetBulletStyle() == attr.GetBulletStyle() &&
- GetBulletNumber() == attr.GetBulletNumber() &&
- GetBulletText() == attr.GetBulletText() &&
- GetBulletName() == attr.GetBulletName() &&
- GetBulletFont() == attr.GetBulletFont() &&
- GetCharacterStyleName() == attr.GetCharacterStyleName() &&
- GetParagraphStyleName() == attr.GetParagraphStyleName() &&
- GetListStyleName() == attr.GetListStyleName() &&
- GetOutlineLevel() == attr.GetOutlineLevel() &&
- GetURL() == attr.GetURL());
-}
-
-wxTextAttrEx wxTextAttrEx::CombineEx(const wxTextAttrEx& attr,
- const wxTextAttrEx& attrDef,
- const wxTextCtrlBase *text)
-{
- wxTextAttrEx newAttr;
-
- // If attr specifies the complete font, just use that font, overriding all
- // default font attributes.
- if ((attr.GetFlags() & wxTEXT_ATTR_FONT) == wxTEXT_ATTR_FONT)
- newAttr.SetFont(attr.GetFont());
- else
- {
- // First find the basic, default font
- long flags = 0;
-
- wxFont font;
- if (attrDef.HasFont())
- {
- flags = (attrDef.GetFlags() & wxTEXT_ATTR_FONT);
- font = attrDef.GetFont();
- }
- else
- {
- if (text)
- font = text->GetFont();
-
- // We leave flags at 0 because no font attributes have been specified yet
- }
- if (!font.Ok())
- font = *wxNORMAL_FONT;
-
- // Otherwise, if there are font attributes in attr, apply them
- if (attr.GetFlags() & wxTEXT_ATTR_FONT)
- {
- if (attr.HasFontSize())
- {
- flags |= wxTEXT_ATTR_FONT_SIZE;
- font.SetPointSize(attr.GetFont().GetPointSize());
- }
- if (attr.HasFontItalic())
- {
- flags |= wxTEXT_ATTR_FONT_ITALIC;;
- font.SetStyle(attr.GetFont().GetStyle());
- }
- if (attr.HasFontWeight())
- {
- flags |= wxTEXT_ATTR_FONT_WEIGHT;
- font.SetWeight(attr.GetFont().GetWeight());
- }
- if (attr.HasFontFaceName())
- {
- flags |= wxTEXT_ATTR_FONT_FACE;
- font.SetFaceName(attr.GetFont().GetFaceName());
- }
- if (attr.HasFontUnderlined())
- {
- flags |= wxTEXT_ATTR_FONT_UNDERLINE;
- font.SetUnderlined(attr.GetFont().GetUnderlined());
- }
- newAttr.SetFont(font);
- newAttr.SetFlags(newAttr.GetFlags()|flags);
- }
- }
-
- // TODO: should really check we are specifying these in the flags,
- // before setting them, as per above; or we will set them willy-nilly.
- // However, we should also check whether this is the intention
- // as per wxTextAttr::Combine, i.e. always to have valid colours
- // in the style.
- wxColour colFg = attr.GetTextColour();
- if ( !colFg.Ok() )
- {
- colFg = attrDef.GetTextColour();
-
- if ( text && !colFg.Ok() )
- colFg = text->GetForegroundColour();
- }
-
- wxColour colBg = attr.GetBackgroundColour();
- if ( !colBg.Ok() )
- {
- colBg = attrDef.GetBackgroundColour();
-
- if ( text && !colBg.Ok() )
- colBg = text->GetBackgroundColour();
- }
-
- newAttr.SetTextColour(colFg);
- newAttr.SetBackgroundColour(colBg);
-
- if (attr.HasAlignment())
- newAttr.SetAlignment(attr.GetAlignment());
- else if (attrDef.HasAlignment())
- newAttr.SetAlignment(attrDef.GetAlignment());
-
- if (attr.HasTabs())
- newAttr.SetTabs(attr.GetTabs());
- else if (attrDef.HasTabs())
- newAttr.SetTabs(attrDef.GetTabs());
-
- if (attr.HasLeftIndent())
- newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
- else if (attrDef.HasLeftIndent())
- newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());
-
- if (attr.HasRightIndent())
- newAttr.SetRightIndent(attr.GetRightIndent());
- else if (attrDef.HasRightIndent())
- newAttr.SetRightIndent(attrDef.GetRightIndent());
-
- // NEW ATTRIBUTES
-
- if (attr.HasParagraphSpacingAfter())
- newAttr.SetParagraphSpacingAfter(attr.GetParagraphSpacingAfter());
-
- if (attr.HasParagraphSpacingBefore())
- newAttr.SetParagraphSpacingBefore(attr.GetParagraphSpacingBefore());
-
- if (attr.HasLineSpacing())
- newAttr.SetLineSpacing(attr.GetLineSpacing());
-
- if (attr.HasCharacterStyleName())
- newAttr.SetCharacterStyleName(attr.GetCharacterStyleName());
-
- if (attr.HasParagraphStyleName())
- newAttr.SetParagraphStyleName(attr.GetParagraphStyleName());
-
- if (attr.HasListStyleName())
- newAttr.SetListStyleName(attr.GetListStyleName());
-
- if (attr.HasBulletStyle())
- newAttr.SetBulletStyle(attr.GetBulletStyle());
-
- if (attr.HasBulletNumber())
- newAttr.SetBulletNumber(attr.GetBulletNumber());
-
- if (attr.HasBulletName())
- newAttr.SetBulletName(attr.GetBulletName());
-
- if (attr.HasBulletText())
- {
- newAttr.SetBulletText(attr.GetBulletText());
- newAttr.SetBulletFont(attr.GetBulletFont());
- }
-
- if (attr.HasURL())
- newAttr.SetURL(attr.GetURL());
-
- if (attr.HasTextEffects())
- {
- newAttr.SetTextEffects(attr.GetTextEffects());
- newAttr.SetTextEffectFlags(attr.GetTextEffectFlags());
- }
-
- if (attr.HasOutlineLevel())
- newAttr.SetOutlineLevel(attr.GetOutlineLevel());
-
- return newAttr;
-}
-
-
/*!
* wxRichTextFileHandler
* Base class for file handlers
IMPLEMENT_CLASS(wxRichTextFileHandler, wxObject)
-#if wxUSE_STREAMS
+#if wxUSE_FFILE && wxUSE_STREAMS
bool wxRichTextFileHandler::LoadFile(wxRichTextBuffer *buffer, const wxString& filename)
{
wxFFileInputStream stream(filename);
return false;
}
-#endif // wxUSE_STREAMS
+#endif // wxUSE_FFILE && wxUSE_STREAMS
/// Can we handle this filename (if using files)? By default, checks the extension.
bool wxRichTextFileHandler::CanHandle(const wxString& filename) const
{
m_data = NULL;
m_dataSize = 0;
- m_imageType = -1;
+ m_imageType = wxBITMAP_TYPE_INVALID;
}
void wxRichTextImageBlock::Clear()
delete[] m_data;
m_data = NULL;
m_dataSize = 0;
- m_imageType = -1;
+ m_imageType = wxBITMAP_TYPE_INVALID;
}
// If it's not a JPEG we can make use of 'image', already scaled, so we don't have to
// load the image a 2nd time.
-bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, int imageType, wxImage& image, bool convertToJPEG)
+bool wxRichTextImageBlock::MakeImageBlock(const wxString& filename, wxBitmapType imageType,
+ wxImage& image, bool convertToJPEG)
{
m_imageType = imageType;
// Make an image block from the wxImage in the given
// format.
-bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, int imageType, int quality)
+bool wxRichTextImageBlock::MakeImageBlock(wxImage& image, wxBitmapType imageType, int quality)
{
m_imageType = imageType;
image.SetOption(wxT("quality"), quality);
// Write data in hex to a stream
bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
{
- wxString hex;
- int i;
- for (i = 0; i < (int) m_dataSize; i++)
+ const int bufSize = 512;
+ char buf[bufSize+1];
+
+ int left = m_dataSize;
+ int n, i, j;
+ j = 0;
+ while (left > 0)
{
- hex = wxDecToHex(m_data[i]);
- wxCharBuffer buf = hex.ToAscii();
+ if (left*2 > bufSize)
+ {
+ n = bufSize; left -= (bufSize/2);
+ }
+ else
+ {
+ n = left*2; left = 0;
+ }
- stream.Write((const char*) buf, hex.length());
- }
+ char* b = buf;
+ for (i = 0; i < (n/2); i++)
+ {
+ wxDecToHex(m_data[j], b, b+1);
+ b += 2; j ++;
+ }
+ buf[n] = 0;
+ stream.Write((const char*) buf, n);
+ }
return true;
}
// Read data in hex from a stream
-bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, int imageType)
+bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, wxBitmapType imageType)
{
int dataSize = length/2;
if (m_data)
delete[] m_data;
- wxString str(wxT(" "));
+ wxChar str[2];
m_data = new unsigned char[dataSize];
int i;
for (i = 0; i < dataSize; i ++)
#endif
// wxUSE_DATAOBJ
+
+/*
+ * wxRichTextFontTable
+ * Manages quick access to a pool of fonts for rendering rich text
+ */
+
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxFont, wxRichTextFontTableHashMap, class WXDLLIMPEXP_RICHTEXT);
+
+class wxRichTextFontTableData: public wxObjectRefData
+{
+public:
+ wxRichTextFontTableData() {}
+
+ wxFont FindFont(const wxTextAttr& fontSpec);
+
+ wxRichTextFontTableHashMap m_hashMap;
+};
+
+wxFont wxRichTextFontTableData::FindFont(const wxTextAttr& fontSpec)
+{
+ wxString facename(fontSpec.GetFontFaceName());
+ wxString spec(wxString::Format(wxT("%d-%d-%d-%d-%s-%d"), fontSpec.GetFontSize(), fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), (int) fontSpec.GetFontUnderlined(), facename.c_str(), (int) fontSpec.GetFontEncoding()));
+ wxRichTextFontTableHashMap::iterator entry = m_hashMap.find(spec);
+
+ if ( entry == m_hashMap.end() )
+ {
+ wxFont font(fontSpec.GetFontSize(), wxDEFAULT, fontSpec.GetFontStyle(), fontSpec.GetFontWeight(), fontSpec.GetFontUnderlined(), facename.c_str());
+ m_hashMap[spec] = font;
+ return font;
+ }
+ else
+ {
+ return entry->second;
+ }
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxRichTextFontTable, wxObject)
+
+wxRichTextFontTable::wxRichTextFontTable()
+{
+ m_refData = new wxRichTextFontTableData;
+}
+
+wxRichTextFontTable::wxRichTextFontTable(const wxRichTextFontTable& table)
+ : wxObject()
+{
+ (*this) = table;
+}
+
+wxRichTextFontTable::~wxRichTextFontTable()
+{
+ UnRef();
+}
+
+bool wxRichTextFontTable::operator == (const wxRichTextFontTable& table) const
+{
+ return (m_refData == table.m_refData);
+}
+
+void wxRichTextFontTable::operator= (const wxRichTextFontTable& table)
+{
+ Ref(table);
+}
+
+wxFont wxRichTextFontTable::FindFont(const wxTextAttr& fontSpec)
+{
+ wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData;
+ if (data)
+ return data->FindFont(fontSpec);
+ else
+ return wxFont();
+}
+
+void wxRichTextFontTable::Clear()
+{
+ wxRichTextFontTableData* data = (wxRichTextFontTableData*) m_refData;
+ if (data)
+ data->m_hashMap.clear();
+}
+
#endif
// wxUSE_RICHTEXT
projects / wxWidgets.git / blobdiff