X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/richtext/richtextstyles.cpp diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp index c0cc55761f..da733e121e 100644 --- a/src/richtext/richtextstyles.cpp +++ b/src/richtext/richtextstyles.cpp @@ -47,11 +47,12 @@ void wxRichTextStyleDefinition::Copy(const wxRichTextStyleDefinition& def) m_baseStyle = def.m_baseStyle; m_style = def.m_style; m_description = def.m_description; + m_properties = def.m_properties; } bool wxRichTextStyleDefinition::Eq(const wxRichTextStyleDefinition& def) const { - return (m_name == def.m_name && m_baseStyle == def.m_baseStyle && m_style == def.m_style); + return (m_name == def.m_name && m_baseStyle == def.m_baseStyle && m_style == def.m_style && m_properties == def.m_properties); } /// Gets the style combined with the base style @@ -60,10 +61,10 @@ wxRichTextAttr wxRichTextStyleDefinition::GetStyleMergedWithBase(const wxRichTex if (m_baseStyle.IsEmpty()) return m_style; - bool isParaStyle = IsKindOf(CLASSINFO(wxRichTextParagraphStyleDefinition)); - bool isCharStyle = IsKindOf(CLASSINFO(wxRichTextCharacterStyleDefinition)); - bool isListStyle = IsKindOf(CLASSINFO(wxRichTextListStyleDefinition)); - bool isBoxStyle = IsKindOf(CLASSINFO(wxRichTextBoxStyleDefinition)); + bool isParaStyle = IsKindOf(wxCLASSINFO(wxRichTextParagraphStyleDefinition)); + bool isCharStyle = IsKindOf(wxCLASSINFO(wxRichTextCharacterStyleDefinition)); + bool isListStyle = IsKindOf(wxCLASSINFO(wxRichTextListStyleDefinition)); + bool isBoxStyle = IsKindOf(wxCLASSINFO(wxRichTextBoxStyleDefinition)); // Collect the styles, detecting loops wxArrayString styleNames; @@ -357,7 +358,7 @@ wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxList& list, c for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext()) { wxRichTextStyleDefinition* def = (wxRichTextStyleDefinition*) node->GetData(); - if (def->GetName().Lower() == name.Lower()) + if (def->GetName() == name) return def; } @@ -442,7 +443,7 @@ bool wxRichTextStyleSheet::AddListStyle(wxRichTextListStyleDefinition* def) /// Add a definition to the box style list bool wxRichTextStyleSheet::AddBoxStyle(wxRichTextBoxStyleDefinition* def) { - def->GetStyle().SetParagraphStyleName(def->GetName()); + def->GetStyle().GetTextBoxAttr().SetBoxStyleName(def->GetName()); return AddStyle(m_boxStyleDefinitions, def); } @@ -523,6 +524,7 @@ void wxRichTextStyleSheet::Copy(const wxRichTextStyleSheet& sheet) SetName(sheet.GetName()); SetDescription(sheet.GetDescription()); + m_properties = sheet.m_properties; } /// Equality @@ -664,6 +666,13 @@ void wxRichTextStyleListBox::UpdateStyles() SendSelectedEvent(); } } + else + { + m_styleNames.Clear(); + SetSelection(wxNOT_FOUND); + SetItemCount(0); + Refresh(); + } } // Get index for style name @@ -697,7 +706,11 @@ int wxRichTextStyleListBox::SetStyleSelection(const wxString& name) { int i = GetIndexForStyle(name); if (i > -1) + { SetSelection(i); + if (!IsVisible(i)) + ScrollToRow(i); + } return i; } @@ -727,11 +740,20 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE) isCentred = true; + str << wxT("
"); + str << wxT(""); + if (isCentred) str << wxT("