X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d7836c47de679f03b1b7e738c77164c11bd3689..22909aef2d8b1f1d245a73640c215af93538c9a9:/src/richtext/richtextstyles.cpp?ds=sidebyside diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp index e1dd06b17e..731634e492 100644 --- a/src/richtext/richtextstyles.cpp +++ b/src/richtext/richtextstyles.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: richtextstyles.cpp +// Name: src/richtext/richtextstyles.cpp // Purpose: Style management for wxRichTextCtrl // Author: Julian Smart -// Modified by: +// Modified by: // Created: 2005-09-30 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,25 +16,226 @@ #pragma hdrstop #endif +#if wxUSE_RICHTEXT + +#include "wx/richtext/richtextstyles.h" + #ifndef WX_PRECOMP #include "wx/wx.h" #endif -#include "wx/image.h" - -#if wxUSE_RICHTEXT - #include "wx/filename.h" #include "wx/clipbrd.h" #include "wx/wfstream.h" -#include "wx/module.h" +#include "wx/settings.h" -#include "wx/richtext/richtextstyles.h" #include "wx/richtext/richtextctrl.h" IMPLEMENT_CLASS(wxRichTextStyleDefinition, wxObject) IMPLEMENT_CLASS(wxRichTextCharacterStyleDefinition, wxRichTextStyleDefinition) IMPLEMENT_CLASS(wxRichTextParagraphStyleDefinition, wxRichTextStyleDefinition) +IMPLEMENT_CLASS(wxRichTextListStyleDefinition, wxRichTextParagraphStyleDefinition) + +/*! + * A definition + */ + +void wxRichTextStyleDefinition::Copy(const wxRichTextStyleDefinition& def) +{ + m_name = def.m_name; + m_baseStyle = def.m_baseStyle; + m_style = def.m_style; + m_description = def.m_description; +} + +bool wxRichTextStyleDefinition::Eq(const wxRichTextStyleDefinition& def) const +{ + return (m_name == def.m_name && m_baseStyle == def.m_baseStyle && m_style == def.m_style); +} + +/// Gets the style combined with the base style +wxTextAttr wxRichTextStyleDefinition::GetStyleMergedWithBase(const wxRichTextStyleSheet* sheet) const +{ + if (!m_baseStyle.IsEmpty()) + { + wxRichTextStyleDefinition* baseStyle = sheet->FindStyle(m_baseStyle); + if (baseStyle) + { + wxTextAttr baseAttr = baseStyle->GetStyleMergedWithBase(sheet); + baseAttr.Apply(m_style, NULL); + return baseAttr; + } + } + return m_style; +} + +/*! + * Paragraph style definition + */ + +void wxRichTextParagraphStyleDefinition::Copy(const wxRichTextParagraphStyleDefinition& def) +{ + wxRichTextStyleDefinition::Copy(def); + + m_nextStyle = def.m_nextStyle; +} + +bool wxRichTextParagraphStyleDefinition::operator ==(const wxRichTextParagraphStyleDefinition& def) const +{ + return (Eq(def) && m_nextStyle == def.m_nextStyle); +} + +/*! + * List style definition + */ + +void wxRichTextListStyleDefinition::Copy(const wxRichTextListStyleDefinition& def) +{ + wxRichTextParagraphStyleDefinition::Copy(def); + + int i; + for (i = 0; i < 10; i++) + m_levelStyles[i] = def.m_levelStyles[i]; +} + +bool wxRichTextListStyleDefinition::operator ==(const wxRichTextListStyleDefinition& def) const +{ + if (!Eq(def)) + return false; + int i; + for (i = 0; i < 10; i++) + if (!(m_levelStyles[i] == def.m_levelStyles[i])) + return false; + + return true; +} + +/// Sets/gets the attributes for the given level +void wxRichTextListStyleDefinition::SetLevelAttributes(int i, const wxTextAttr& attr) +{ + wxASSERT( (i >= 0 && i < 10) ); + if (i >= 0 && i < 10) + m_levelStyles[i] = attr; +} + +const wxTextAttr* wxRichTextListStyleDefinition::GetLevelAttributes(int i) const +{ + wxASSERT( (i >= 0 && i < 10) ); + if (i >= 0 && i < 10) + return & m_levelStyles[i]; + else + return NULL; +} + +wxTextAttr* wxRichTextListStyleDefinition::GetLevelAttributes(int i) +{ + wxASSERT( (i >= 0 && i < 10) ); + if (i >= 0 && i < 10) + return & m_levelStyles[i]; + else + return NULL; +} + +/// Convenience function for setting the major attributes for a list level specification +void wxRichTextListStyleDefinition::SetAttributes(int i, int leftIndent, int leftSubIndent, int bulletStyle, const wxString& bulletSymbol) +{ + wxASSERT( (i >= 0 && i < 10) ); + if (i >= 0 && i < 10) + { + wxTextAttr attr; + + attr.SetBulletStyle(bulletStyle); + attr.SetLeftIndent(leftIndent, leftSubIndent); + + if (!bulletSymbol.IsEmpty()) + { + if (bulletStyle & wxTEXT_ATTR_BULLET_STYLE_SYMBOL) + attr.SetBulletText(bulletSymbol); + else + attr.SetBulletName(bulletSymbol); + } + + m_levelStyles[i] = attr; + } +} + +/// Finds the level corresponding to the given indentation +int wxRichTextListStyleDefinition::FindLevelForIndent(int indent) const +{ + int i; + for (i = 0; i < 10; i++) + { + if (indent < m_levelStyles[i].GetLeftIndent()) + { + if (i > 0) + return i - 1; + else + return 0; + } + } + return 9; +} + +/// Combine the list style with a paragraph style, using the given indent (from which +/// an appropriate level is found) +wxTextAttr wxRichTextListStyleDefinition::CombineWithParagraphStyle(int indent, const wxTextAttr& paraStyle, wxRichTextStyleSheet* styleSheet) +{ + int listLevel = FindLevelForIndent(indent); + + wxTextAttr attr(*GetLevelAttributes(listLevel)); + int oldLeftIndent = attr.GetLeftIndent(); + int oldLeftSubIndent = attr.GetLeftSubIndent(); + + // First apply the overall paragraph style, if any + if (styleSheet) + attr.Apply(GetStyleMergedWithBase(styleSheet)); + else + attr.Apply(GetStyle()); + + // Then apply paragraph style, e.g. from paragraph style definition + attr.Apply(paraStyle); + + // We override the indents according to the list definition + attr.SetLeftIndent(oldLeftIndent, oldLeftSubIndent); + + return attr; +} + +/// Combine the base and list style, using the given indent (from which +/// an appropriate level is found) +wxTextAttr wxRichTextListStyleDefinition::GetCombinedStyle(int indent, wxRichTextStyleSheet* styleSheet) +{ + int listLevel = FindLevelForIndent(indent); + return GetCombinedStyleForLevel(listLevel, styleSheet); +} + +/// Combine the base and list style, using the given indent (from which +/// an appropriate level is found) +wxTextAttr wxRichTextListStyleDefinition::GetCombinedStyleForLevel(int listLevel, wxRichTextStyleSheet* styleSheet) +{ + wxTextAttr attr(*GetLevelAttributes(listLevel)); + int oldLeftIndent = attr.GetLeftIndent(); + int oldLeftSubIndent = attr.GetLeftSubIndent(); + + // Apply the overall paragraph style, if any + if (styleSheet) + attr.Apply(GetStyleMergedWithBase(styleSheet)); + else + attr.Apply(GetStyle()); + + // We override the indents according to the list definition + attr.SetLeftIndent(oldLeftIndent, oldLeftSubIndent); + + return attr; +} + +/// Is this a numbered list? +bool wxRichTextListStyleDefinition::IsNumbered(int i) const +{ + return (0 != (GetLevelAttributes(i)->GetFlags() & + (wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER|wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER| + wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER|wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER))); +} /*! * The style manager @@ -42,9 +243,25 @@ IMPLEMENT_CLASS(wxRichTextParagraphStyleDefinition, wxRichTextStyleDefinition) IMPLEMENT_CLASS(wxRichTextStyleSheet, wxObject) +wxRichTextStyleSheet::~wxRichTextStyleSheet() +{ + DeleteStyles(); + + if (m_nextSheet) + m_nextSheet->m_previousSheet = m_previousSheet; + + if (m_previousSheet) + m_previousSheet->m_nextSheet = m_nextSheet; + + m_previousSheet = NULL; + m_nextSheet = NULL; +} + /// Initialisation void wxRichTextStyleSheet::Init() { + m_previousSheet = NULL; + m_nextSheet = NULL; } /// Add a definition to one of the style lists @@ -58,11 +275,11 @@ bool wxRichTextStyleSheet::AddStyle(wxList& list, wxRichTextStyleDefinition* def /// Remove a style bool wxRichTextStyleSheet::RemoveStyle(wxList& list, wxRichTextStyleDefinition* def, bool deleteStyle) { - wxNode* node = list.Find(def); + wxList::compatibility_iterator node = list.Find(def); if (node) { wxRichTextStyleDefinition* def = (wxRichTextStyleDefinition*) node->GetData(); - delete node; + list.Erase(node); if (deleteStyle) delete def; return true; @@ -71,16 +288,32 @@ bool wxRichTextStyleSheet::RemoveStyle(wxList& list, wxRichTextStyleDefinition* return false; } +/// Remove a style +bool wxRichTextStyleSheet::RemoveStyle(wxRichTextStyleDefinition* def, bool deleteStyle) +{ + if (RemoveParagraphStyle(def, deleteStyle)) + return true; + if (RemoveCharacterStyle(def, deleteStyle)) + return true; + if (RemoveListStyle(def, deleteStyle)) + return true; + return false; +} + /// Find a definition by name -wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxList& list, const wxString& name) const +wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxList& list, const wxString& name, bool recurse) const { - for (wxNode* node = list.GetFirst(); node; node = node->GetNext()) + for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) { wxRichTextStyleDefinition* def = (wxRichTextStyleDefinition*) node->GetData(); if (def->GetName().Lower() == name.Lower()) return def; } - return NULL; + + if (m_nextSheet && recurse) + return m_nextSheet->FindStyle(list, name, recurse); + + return NULL; } /// Delete all styles @@ -88,26 +321,169 @@ void wxRichTextStyleSheet::DeleteStyles() { WX_CLEAR_LIST(wxList, m_characterStyleDefinitions); WX_CLEAR_LIST(wxList, m_paragraphStyleDefinitions); + WX_CLEAR_LIST(wxList, m_listStyleDefinitions); +} + +/// Insert into list of style sheets +bool wxRichTextStyleSheet::InsertSheet(wxRichTextStyleSheet* before) +{ + m_previousSheet = before->m_previousSheet; + m_nextSheet = before; + + before->m_previousSheet = this; + return true; +} + +/// Append to list of style sheets +bool wxRichTextStyleSheet::AppendSheet(wxRichTextStyleSheet* after) +{ + wxRichTextStyleSheet* last = after; + while (last && last->m_nextSheet) + { + last = last->m_nextSheet; + } + + if (last) + { + m_previousSheet = last; + last->m_nextSheet = this; + + return true; + } + else + return false; +} + +/// Unlink from the list of style sheets +void wxRichTextStyleSheet::Unlink() +{ + if (m_previousSheet) + m_previousSheet->m_nextSheet = m_nextSheet; + if (m_nextSheet) + m_nextSheet->m_previousSheet = m_previousSheet; + + m_previousSheet = NULL; + m_nextSheet = NULL; +} + +/// Add a definition to the character style list +bool wxRichTextStyleSheet::AddCharacterStyle(wxRichTextCharacterStyleDefinition* def) +{ + def->GetStyle().SetCharacterStyleName(def->GetName()); + return AddStyle(m_characterStyleDefinitions, def); +} + +/// Add a definition to the paragraph style list +bool wxRichTextStyleSheet::AddParagraphStyle(wxRichTextParagraphStyleDefinition* def) +{ + def->GetStyle().SetParagraphStyleName(def->GetName()); + return AddStyle(m_paragraphStyleDefinitions, def); +} + +/// Add a definition to the list style list +bool wxRichTextStyleSheet::AddListStyle(wxRichTextListStyleDefinition* def) +{ + def->GetStyle().SetListStyleName(def->GetName()); + return AddStyle(m_listStyleDefinitions, def); +} + +/// Add a definition to the appropriate style list +bool wxRichTextStyleSheet::AddStyle(wxRichTextStyleDefinition* def) +{ + wxRichTextListStyleDefinition* listDef = wxDynamicCast(def, wxRichTextListStyleDefinition); + if (listDef) + return AddListStyle(listDef); + + wxRichTextParagraphStyleDefinition* paraDef = wxDynamicCast(def, wxRichTextParagraphStyleDefinition); + if (paraDef) + return AddParagraphStyle(paraDef); + + wxRichTextCharacterStyleDefinition* charDef = wxDynamicCast(def, wxRichTextCharacterStyleDefinition); + if (charDef) + return AddCharacterStyle(charDef); + + return false; +} + +/// Find any definition by name +wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxString& name, bool recurse) const +{ + wxRichTextListStyleDefinition* listDef = FindListStyle(name, recurse); + if (listDef) + return listDef; + + wxRichTextParagraphStyleDefinition* paraDef = FindParagraphStyle(name, recurse); + if (paraDef) + return paraDef; + + wxRichTextCharacterStyleDefinition* charDef = FindCharacterStyle(name, recurse); + if (charDef) + return charDef; + + return NULL; } +/// Copy +void wxRichTextStyleSheet::Copy(const wxRichTextStyleSheet& sheet) +{ + DeleteStyles(); + + wxList::compatibility_iterator node; + + for (node = sheet.m_characterStyleDefinitions.GetFirst(); node; node = node->GetNext()) + { + wxRichTextCharacterStyleDefinition* def = (wxRichTextCharacterStyleDefinition*) node->GetData(); + AddCharacterStyle(new wxRichTextCharacterStyleDefinition(*def)); + } + + for (node = sheet.m_paragraphStyleDefinitions.GetFirst(); node; node = node->GetNext()) + { + wxRichTextParagraphStyleDefinition* def = (wxRichTextParagraphStyleDefinition*) node->GetData(); + AddParagraphStyle(new wxRichTextParagraphStyleDefinition(*def)); + } + + for (node = sheet.m_listStyleDefinitions.GetFirst(); node; node = node->GetNext()) + { + wxRichTextListStyleDefinition* def = (wxRichTextListStyleDefinition*) node->GetData(); + AddListStyle(new wxRichTextListStyleDefinition(*def)); + } + + SetName(sheet.GetName()); + SetDescription(sheet.GetDescription()); +} + +/// Equality +bool wxRichTextStyleSheet::operator==(const wxRichTextStyleSheet& WXUNUSED(sheet)) const +{ + // TODO + return false; +} + + #if wxUSE_HTML /*! - * wxRichTextStyleListBox class declaration - * A listbox to display styles. + * wxRichTextStyleListBox: a listbox to display styles. */ IMPLEMENT_CLASS(wxRichTextStyleListBox, wxHtmlListBox) BEGIN_EVENT_TABLE(wxRichTextStyleListBox, wxHtmlListBox) - EVT_LISTBOX(wxID_ANY, wxRichTextStyleListBox::OnSelect) EVT_LEFT_DOWN(wxRichTextStyleListBox::OnLeftDown) + EVT_LEFT_DCLICK(wxRichTextStyleListBox::OnLeftDoubleClick) + EVT_IDLE(wxRichTextStyleListBox::OnIdle) END_EVENT_TABLE() wxRichTextStyleListBox::wxRichTextStyleListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos, - const wxSize& size, long style): wxHtmlListBox(parent, id, pos, size, style) + const wxSize& size, long style) { - m_styleSheet = NULL; - m_richTextCtrl = NULL; + Init(); + Create(parent, id, pos, size, style); +} + +bool wxRichTextStyleListBox::Create(wxWindow* parent, wxWindowID id, const wxPoint& pos, + const wxSize& size, long style) +{ + return wxHtmlListBox::Create(parent, id, pos, size, style); } wxRichTextStyleListBox::~wxRichTextStyleListBox() @@ -120,22 +496,10 @@ wxString wxRichTextStyleListBox::OnGetItem(size_t n) const if (!GetStyleSheet()) return wxEmptyString; - // First paragraph styles, then character - if (n < GetStyleSheet()->GetParagraphStyleCount()) - { - wxRichTextParagraphStyleDefinition* def = GetStyleSheet()->GetParagraphStyle(n); - - wxString str = CreateHTML(def); - return str; - } - - if ((n - GetStyleSheet()->GetParagraphStyleCount()) < GetStyleSheet()->GetCharacterStyleCount()) - { - wxRichTextCharacterStyleDefinition* def = GetStyleSheet()->GetCharacterStyle(n - GetStyleSheet()->GetParagraphStyleCount()); + wxRichTextStyleDefinition* def = GetStyle(n); + if (def) + return CreateHTML(def); - wxString str = CreateHTML(def); - return str; - } return wxEmptyString; } @@ -145,14 +509,10 @@ wxRichTextStyleDefinition* wxRichTextStyleListBox::GetStyle(size_t i) const if (!GetStyleSheet()) return NULL; - // First paragraph styles, then character - if (i < GetStyleSheet()->GetParagraphStyleCount()) - return GetStyleSheet()->GetParagraphStyle(i); - - if ((i - GetStyleSheet()->GetParagraphStyleCount()) < GetStyleSheet()->GetCharacterStyleCount()) - return GetStyleSheet()->GetCharacterStyle(i - GetStyleSheet()->GetParagraphStyleCount()); + if (i >= m_styleNames.GetCount() /* || i < 0 */ ) + return NULL; - return NULL; + return GetStyleSheet()->FindStyle(m_styleNames[i]); } /// Updates the list @@ -160,11 +520,55 @@ void wxRichTextStyleListBox::UpdateStyles() { if (GetStyleSheet()) { - SetItemCount(GetStyleSheet()->GetParagraphStyleCount()+GetStyleSheet()->GetCharacterStyleCount()); + SetSelection(wxNOT_FOUND); + + m_styleNames.Clear(); + + size_t i; + if (GetStyleType() == wxRICHTEXT_STYLE_ALL || GetStyleType() == wxRICHTEXT_STYLE_PARAGRAPH) + { + for (i = 0; i < GetStyleSheet()->GetParagraphStyleCount(); i++) + m_styleNames.Add(GetStyleSheet()->GetParagraphStyle(i)->GetName()); + } + if (GetStyleType() == wxRICHTEXT_STYLE_ALL || GetStyleType() == wxRICHTEXT_STYLE_CHARACTER) + { + for (i = 0; i < GetStyleSheet()->GetCharacterStyleCount(); i++) + m_styleNames.Add(GetStyleSheet()->GetCharacterStyle(i)->GetName()); + } + if (GetStyleType() == wxRICHTEXT_STYLE_ALL || GetStyleType() == wxRICHTEXT_STYLE_LIST) + { + for (i = 0; i < GetStyleSheet()->GetListStyleCount(); i++) + m_styleNames.Add(GetStyleSheet()->GetListStyle(i)->GetName()); + } + + m_styleNames.Sort(); + SetItemCount(m_styleNames.GetCount()); + Refresh(); + + if (GetItemCount() > 0) + { + SetSelection(0); + SendSelectedEvent(); + } } } +// Get index for style name +int wxRichTextStyleListBox::GetIndexForStyle(const wxString& name) const +{ + return m_styleNames.Index(name); +} + +/// Set selection for string +int wxRichTextStyleListBox::SetStyleSelection(const wxString& name) +{ + int i = GetIndexForStyle(name); + if (i > -1) + SetSelection(i); + return i; +} + // Convert a colour to a 6-digit hex string static wxString ColourToHexString(const wxColour& col) { @@ -180,31 +584,116 @@ static wxString ColourToHexString(const wxColour& col) /// Creates a suitable HTML fragment for a definition wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) const { - wxString str(wxT("
"); + str << wxT(" | "); } - str << wxT(" | "); + if (isCentred) + str << wxT(" | "); + else + str << wxT(" | "); + +#ifdef __WXMSW__ + int size = 2; +#else + int size = 3; +#endif - int size = 5; + // Guess a standard font size + int stdFontSize = 0; - // Standard size is 12, say - size += 12 - def->GetStyle().GetFontSize(); + // First see if we have a default/normal style to base the size on + wxString normalTranslated(_("normal")); + wxString defaultTranslated(_("default")); + size_t i; + for (i = 0; i < m_styleNames.GetCount(); i++) + { + wxString name = m_styleNames[i].Lower(); + if (name.Find(wxT("normal")) != wxNOT_FOUND || name.Find(normalTranslated) != wxNOT_FOUND || + name.Find(wxT("default")) != wxNOT_FOUND || name.Find(defaultTranslated) != wxNOT_FOUND) + { + wxRichTextStyleDefinition* d = GetStyleSheet()->FindStyle(m_styleNames[i]); + if (d) + { + wxRichTextAttr attr2(d->GetStyleMergedWithBase(GetStyleSheet())); + if (attr2.HasFontSize()) + { + stdFontSize = attr2.GetFontSize(); + break; + } + } + } + } + + if (stdFontSize == 0) + { + // Look at sizes up to 20 points, and see which is the most common + wxArrayInt sizes; + size_t maxSize = 20; + for (i = 0; i <= maxSize; i++) + sizes.Add(0); + for (i = 0; i < m_styleNames.GetCount(); i++) + { + wxRichTextStyleDefinition* d = GetStyleSheet()->FindStyle(m_styleNames[i]); + if (d) + { + wxRichTextAttr attr2(d->GetStyleMergedWithBase(GetStyleSheet())); + if (attr2.HasFontSize()) + { + if (attr2.GetFontSize() <= (int) maxSize) + sizes[attr2.GetFontSize()] ++; + } + } + } + int mostCommonSize = 0; + for (i = 0; i <= maxSize; i++) + { + if (sizes[i] > mostCommonSize) + mostCommonSize = i; + } + if (mostCommonSize > 0) + stdFontSize = mostCommonSize; + } + + if (stdFontSize == 0) + stdFontSize = 12; + + int thisFontSize = ((attr.GetFlags() & wxTEXT_ATTR_FONT_SIZE) != 0) ? attr.GetFontSize() : stdFontSize; + + if (thisFontSize < stdFontSize) + size --; + else if (thisFontSize > stdFontSize) + size ++; str += wxT("GetStyle().GetFontFaceName() << wxT("\""); + if (!attr.GetFontFaceName().IsEmpty()) + str << wxT(" face=\"") << attr.GetFontFaceName() << wxT("\""); - if (def->GetStyle().GetTextColour().Ok()) - str << wxT(" color=\"#") << ColourToHexString(def->GetStyle().GetTextColour()) << wxT("\""); + if (attr.GetTextColour().Ok()) + str << wxT(" color=\"#") << ColourToHexString(attr.GetTextColour()) << wxT("\""); str << wxT(">"); @@ -212,11 +701,11 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons bool hasItalic = false; bool hasUnderline = false; - if (def->GetStyle().GetFontWeight() == wxBOLD) + if (attr.GetFontWeight() == wxBOLD) hasBold = true; - if (def->GetStyle().GetFontStyle() == wxITALIC) + if (attr.GetFontStyle() == wxITALIC) hasItalic = true; - if (def->GetStyle().GetFontUnderlined()) + if (attr.GetFontUnderlined()) hasUnderline = true; if (hasBold) @@ -235,9 +724,16 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons if (hasBold) str << wxT(""); + if (isCentred) + str << wxT(""); + str << wxT(""); - str += wxT(" |