X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38f833b10c071603eb8d7739ab31b1c07c4576f1..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/richtext/richtextstyles.cpp?ds=sidebyside diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp index 86ac5b074d..e530832977 100644 --- a/src/richtext/richtextstyles.cpp +++ b/src/richtext/richtextstyles.cpp @@ -45,6 +45,7 @@ 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 @@ -52,6 +53,22 @@ 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 */ @@ -75,7 +92,7 @@ bool wxRichTextParagraphStyleDefinition::operator ==(const wxRichTextParagraphSt void wxRichTextListStyleDefinition::Copy(const wxRichTextListStyleDefinition& def) { wxRichTextParagraphStyleDefinition::Copy(def); - + int i; for (i = 0; i < 10; i++) m_levelStyles[i] = def.m_levelStyles[i]; @@ -89,19 +106,19 @@ bool wxRichTextListStyleDefinition::operator ==(const wxRichTextListStyleDefinit 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 wxTextAttrEx& attr) +void wxRichTextListStyleDefinition::SetLevelAttributes(int i, const wxTextAttr& attr) { wxASSERT( (i >= 0 && i < 10) ); if (i >= 0 && i < 10) m_levelStyles[i] = attr; } -const wxTextAttrEx* wxRichTextListStyleDefinition::GetLevelAttributes(int i) const +const wxTextAttr* wxRichTextListStyleDefinition::GetLevelAttributes(int i) const { wxASSERT( (i >= 0 && i < 10) ); if (i >= 0 && i < 10) @@ -110,7 +127,7 @@ const wxTextAttrEx* wxRichTextListStyleDefinition::GetLevelAttributes(int i) con return NULL; } -wxTextAttrEx* wxRichTextListStyleDefinition::GetLevelAttributes(int i) +wxTextAttr* wxRichTextListStyleDefinition::GetLevelAttributes(int i) { wxASSERT( (i >= 0 && i < 10) ); if (i >= 0 && i < 10) @@ -125,16 +142,21 @@ void wxRichTextListStyleDefinition::SetAttributes(int i, int leftIndent, int lef wxASSERT( (i >= 0 && i < 10) ); if (i >= 0 && i < 10) { - wxTextAttrEx attr; - + wxTextAttr attr; + attr.SetBulletStyle(bulletStyle); attr.SetLeftIndent(leftIndent, leftSubIndent); if (!bulletSymbol.IsEmpty()) - attr.SetBulletSymbol(bulletSymbol[0]); - - m_levelStyles[i] = attr; - } + { + 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 @@ -156,48 +178,54 @@ int wxRichTextListStyleDefinition::FindLevelForIndent(int indent) const /// Combine the list style with a paragraph style, using the given indent (from which /// an appropriate level is found) -wxTextAttrEx wxRichTextListStyleDefinition::CombineWithParagraphStyle(int indent, const wxTextAttrEx& paraStyle) +wxTextAttr wxRichTextListStyleDefinition::CombineWithParagraphStyle(int indent, const wxTextAttr& paraStyle, wxRichTextStyleSheet* styleSheet) { int listLevel = FindLevelForIndent(indent); - - wxTextAttrEx attr(*GetLevelAttributes(listLevel)); + + wxTextAttr attr(*GetLevelAttributes(listLevel)); int oldLeftIndent = attr.GetLeftIndent(); int oldLeftSubIndent = attr.GetLeftSubIndent(); - // First apply the overall paragraph style, if any - wxRichTextApplyStyle(attr, GetStyle()); + // 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 - wxRichTextApplyStyle(attr, paraStyle); - + 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) -wxTextAttrEx wxRichTextListStyleDefinition::GetCombinedStyle(int indent) +wxTextAttr wxRichTextListStyleDefinition::GetCombinedStyle(int indent, wxRichTextStyleSheet* styleSheet) { int listLevel = FindLevelForIndent(indent); - return GetCombinedStyleForLevel(listLevel); + return GetCombinedStyleForLevel(listLevel, styleSheet); } /// Combine the base and list style, using the given indent (from which /// an appropriate level is found) -wxTextAttrEx wxRichTextListStyleDefinition::GetCombinedStyleForLevel(int listLevel) +wxTextAttr wxRichTextListStyleDefinition::GetCombinedStyleForLevel(int listLevel, wxRichTextStyleSheet* styleSheet) { - wxTextAttrEx attr(*GetLevelAttributes(listLevel)); + wxTextAttr attr(*GetLevelAttributes(listLevel)); int oldLeftIndent = attr.GetLeftIndent(); int oldLeftSubIndent = attr.GetLeftSubIndent(); - // Apply the overall paragraph style, if any - wxRichTextApplyStyle(attr, GetStyle()); + // 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; } @@ -221,10 +249,10 @@ wxRichTextStyleSheet::~wxRichTextStyleSheet() if (m_nextSheet) m_nextSheet->m_previousSheet = m_previousSheet; - + if (m_previousSheet) m_previousSheet->m_nextSheet = m_nextSheet; - + m_previousSheet = NULL; m_nextSheet = NULL; } @@ -260,6 +288,18 @@ 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, bool recurse) const { @@ -269,7 +309,7 @@ wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxList& list, c if (def->GetName().Lower() == name.Lower()) return def; } - + if (m_nextSheet && recurse) return m_nextSheet->FindStyle(list, name, recurse); @@ -289,7 +329,7 @@ bool wxRichTextStyleSheet::InsertSheet(wxRichTextStyleSheet* before) { m_previousSheet = before->m_previousSheet; m_nextSheet = before; - + before->m_previousSheet = this; return true; } @@ -302,12 +342,12 @@ bool wxRichTextStyleSheet::AppendSheet(wxRichTextStyleSheet* after) { last = last->m_nextSheet; } - + if (last) { m_previousSheet = last; last->m_nextSheet = this; - + return true; } else @@ -321,7 +361,7 @@ void wxRichTextStyleSheet::Unlink() m_previousSheet->m_nextSheet = m_nextSheet; if (m_nextSheet) m_nextSheet->m_previousSheet = m_previousSheet; - + m_previousSheet = NULL; m_nextSheet = NULL; } @@ -347,6 +387,42 @@ bool wxRichTextStyleSheet::AddListStyle(wxRichTextListStyleDefinition* def) 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) { @@ -371,6 +447,9 @@ void wxRichTextStyleSheet::Copy(const wxRichTextStyleSheet& sheet) wxRichTextListStyleDefinition* def = (wxRichTextListStyleDefinition*) node->GetData(); AddListStyle(new wxRichTextListStyleDefinition(*def)); } + + SetName(sheet.GetName()); + SetDescription(sheet.GetDescription()); } /// Equality @@ -389,7 +468,6 @@ bool wxRichTextStyleSheet::operator==(const wxRichTextStyleSheet& WXUNUSED(sheet 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) @@ -417,7 +495,7 @@ wxString wxRichTextStyleListBox::OnGetItem(size_t n) const { if (!GetStyleSheet()) return wxEmptyString; - + wxRichTextStyleDefinition* def = GetStyle(n); if (def) return CreateHTML(def); @@ -431,32 +509,10 @@ wxRichTextStyleDefinition* wxRichTextStyleListBox::GetStyle(size_t i) const if (!GetStyleSheet()) return NULL; - if (GetStyleType() == wxRICHTEXT_STYLE_ALL) - { - // First paragraph styles, then character, then list - if (i < GetStyleSheet()->GetParagraphStyleCount()) - return GetStyleSheet()->GetParagraphStyle(i); - - if ((i - GetStyleSheet()->GetParagraphStyleCount()) < GetStyleSheet()->GetCharacterStyleCount()) - return GetStyleSheet()->GetCharacterStyle(i - GetStyleSheet()->GetParagraphStyleCount()); - - if ((i - GetStyleSheet()->GetParagraphStyleCount() - GetStyleSheet()->GetCharacterStyleCount()) < GetStyleSheet()->GetListStyleCount()) - return GetStyleSheet()->GetListStyle(i - GetStyleSheet()->GetParagraphStyleCount() - GetStyleSheet()->GetCharacterStyleCount()); - } - else if ((GetStyleType() == wxRICHTEXT_STYLE_PARAGRAPH) && (i < GetStyleSheet()->GetParagraphStyleCount())) - { - return GetStyleSheet()->GetParagraphStyle(i); - } - else if ((GetStyleType() == wxRICHTEXT_STYLE_CHARACTER) && (i < GetStyleSheet()->GetCharacterStyleCount())) - { - return GetStyleSheet()->GetCharacterStyle(i); - } - else if ((GetStyleType() == wxRICHTEXT_STYLE_LIST) && (i < GetStyleSheet()->GetListStyleCount())) - { - return GetStyleSheet()->GetListStyle(i); - } + if (i >= m_styleNames.GetCount() /* || i < 0 */ ) + return NULL; - return NULL; + return GetStyleSheet()->FindStyle(m_styleNames[i]); } /// Updates the list @@ -464,34 +520,44 @@ void wxRichTextStyleListBox::UpdateStyles() { if (GetStyleSheet()) { - if (GetStyleType() == wxRICHTEXT_STYLE_ALL) - SetItemCount(GetStyleSheet()->GetParagraphStyleCount()+GetStyleSheet()->GetCharacterStyleCount()+GetStyleSheet()->GetListStyleCount()); - else if (GetStyleType() == wxRICHTEXT_STYLE_PARAGRAPH) - SetItemCount(GetStyleSheet()->GetParagraphStyleCount()); - else if (GetStyleType() == wxRICHTEXT_STYLE_CHARACTER) - SetItemCount(GetStyleSheet()->GetCharacterStyleCount()); - else if (GetStyleType() == wxRICHTEXT_STYLE_LIST) - SetItemCount(GetStyleSheet()->GetListStyleCount()); + 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 { - if (GetStyleSheet()) - { - int count = GetItemCount(); - - int i; - for (i = 0; i < (int) count; i++) - { - wxRichTextStyleDefinition* def = GetStyle(i); - if (def->GetName() == name) - return i; - } - } - return -1; + return m_styleNames.Index(name); } /// Set selection for string @@ -520,31 +586,56 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons { // TODO: indicate list format for list style types - wxString str(wxT("")); + wxString str; + + bool isCentred = false; - if (def->GetStyle().GetLeftIndent() > 0) + wxTextAttr attr(def->GetStyleMergedWithBase(GetStyleSheet())); + + if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE) + isCentred = true; + + if (isCentred) + str << wxT("
"); + + + str << wxT("
"); + + if (attr.GetLeftIndent() > 0) { wxClientDC dc((wxWindow*) this); - str << wxT(""); + str << wxT(""); } - str << wxT("
"); + if (isCentred) + str << wxT(""); + else + str << wxT(""); +#ifdef __WXMSW__ + int size = 3; +#else int size = 4; +#endif - // Standard size is 12, say - size += (def->GetStyle().HasFont() ? def->GetStyle().GetFontSize() : 12) - 12; + int 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(">"); @@ -552,11 +643,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) @@ -575,9 +666,16 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons if (hasBold) str << wxT(""); + if (isCentred) + str << wxT(""); + str << wxT(""); - str += wxT("
"); + str << wxT(""); + + if (isCentred) + str << wxT(""); + return str; } @@ -593,18 +691,6 @@ int wxRichTextStyleListBox::ConvertTenthsMMToPixels(wxDC& dc, int units) const return (int) pixels; } -/// React to selection -void wxRichTextStyleListBox::OnSelect(wxCommandEvent& WXUNUSED(event)) -{ -#if 0 - wxRichTextStyleDefinition* def = GetStyle(event.GetSelection()); - if (def) - { - wxMessageBox(def->GetName()); - } -#endif -} - void wxRichTextStyleListBox::OnLeftDown(wxMouseEvent& event) { wxVListBox::OnLeftDown(event); @@ -636,15 +722,20 @@ wxString wxRichTextStyleListBox::GetStyleToShowInIdleTime(wxRichTextCtrl* ctrl, // Take into account current default style just chosen by user if (ctrl->IsDefaultStyleShowing()) { + wxTextAttr attr; + + ctrl->GetStyle(adjustedCaretPos, attr); + wxRichTextApplyStyle(attr, ctrl->GetDefaultStyleEx()); + if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_CHARACTER) && - !ctrl->GetDefaultStyleEx().GetCharacterStyleName().IsEmpty()) - styleName = ctrl->GetDefaultStyleEx().GetCharacterStyleName(); + !attr.GetCharacterStyleName().IsEmpty()) + styleName = attr.GetCharacterStyleName(); else if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_PARAGRAPH) && - !ctrl->GetDefaultStyleEx().GetParagraphStyleName().IsEmpty()) - styleName = ctrl->GetDefaultStyleEx().GetParagraphStyleName(); + !attr.GetParagraphStyleName().IsEmpty()) + styleName = attr.GetParagraphStyleName(); else if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_LIST) && - !ctrl->GetDefaultStyleEx().GetListStyleName().IsEmpty()) - styleName = ctrl->GetDefaultStyleEx().GetListStyleName(); + !attr.GetListStyleName().IsEmpty()) + styleName = attr.GetListStyleName(); } else if (obj && (styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_CHARACTER) && !obj->GetAttributes().GetCharacterStyleName().IsEmpty()) @@ -661,7 +752,7 @@ wxString wxRichTextStyleListBox::GetStyleToShowInIdleTime(wxRichTextCtrl* ctrl, { styleName = para->GetAttributes().GetListStyleName(); } - + return styleName; } @@ -723,38 +814,64 @@ wxRichTextStyleListCtrl::wxRichTextStyleListCtrl(wxWindow* parent, wxWindowID id bool wxRichTextStyleListCtrl::Create(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) { + if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT) + style |= wxBORDER_THEME; + wxControl::Create(parent, id, pos, size, style); - + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - - m_styleListBox = new wxRichTextStyleListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER); - - wxArrayString choices; - choices.Add(_("All styles")); - choices.Add(_("Paragraph styles")); - choices.Add(_("Character styles")); - choices.Add(_("List styles")); - - m_styleChoice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, choices); - + if (size != wxDefaultSize) + SetInitialSize(size); + + bool showSelector = ((style & wxRICHTEXTSTYLELIST_HIDE_TYPE_SELECTOR) == 0); + + wxBorder listBoxStyle; + if (showSelector) + listBoxStyle = wxBORDER_THEME; + else + listBoxStyle = wxBORDER_NONE; + + m_styleListBox = new wxRichTextStyleListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, listBoxStyle); + wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL); - boxSizer->Add(m_styleListBox, 1, wxALL|wxEXPAND, 5); - boxSizer->Add(m_styleChoice, 0, wxALL|wxEXPAND, 5); - - SetSizer(boxSizer); + + if (showSelector) + { + wxArrayString choices; + choices.Add(_("All styles")); + choices.Add(_("Paragraph styles")); + choices.Add(_("Character styles")); + choices.Add(_("List styles")); + + m_styleChoice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, choices); + + boxSizer->Add(m_styleListBox, 1, wxALL|wxEXPAND, 5); + boxSizer->Add(m_styleChoice, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, 5); + } + else + { + boxSizer->Add(m_styleListBox, 1, wxALL|wxEXPAND, 0); + } + + SetSizer(boxSizer); + Layout(); m_dontUpdate = true; - - int i = StyleTypeToIndex(m_styleListBox->GetStyleType()); - m_styleChoice->SetSelection(i); - + + if (m_styleChoice) + { + int i = StyleTypeToIndex(m_styleListBox->GetStyleType()); + m_styleChoice->SetSelection(i); + } + m_dontUpdate = false; - + return true; } wxRichTextStyleListCtrl::~wxRichTextStyleListCtrl() { + } /// React to style type choice @@ -766,7 +883,7 @@ void wxRichTextStyleListCtrl::OnChooseType(wxCommandEvent& event) { if (m_dontUpdate) return; - + wxRichTextStyleListBox::wxRichTextStyleType styleType = StyleIndexToType(event.GetSelection()); m_styleListBox->SetStyleType(styleType); } @@ -847,17 +964,19 @@ wxRichTextCtrl* wxRichTextStyleListCtrl::GetRichTextCtrl() const /// Set/get the style type to display void wxRichTextStyleListCtrl::SetStyleType(wxRichTextStyleListBox::wxRichTextStyleType styleType) { - if (m_styleListBox) - m_styleListBox->SetStyleType(styleType); + if ( !m_styleListBox ) + return; + + m_styleListBox->SetStyleType(styleType); m_dontUpdate = true; if (m_styleChoice) - { + { int i = StyleTypeToIndex(m_styleListBox->GetStyleType()); m_styleChoice->SetSelection(i); } - + m_dontUpdate = false; } @@ -873,7 +992,7 @@ wxRichTextStyleListBox::wxRichTextStyleType wxRichTextStyleListCtrl::GetStyleTyp void wxRichTextStyleListCtrl::UpdateStyles() { if (m_styleListBox) - m_styleListBox->UpdateStyles(); + m_styleListBox->UpdateStyles(); } #if wxUSE_COMBOCTRL @@ -888,6 +1007,17 @@ BEGIN_EVENT_TABLE(wxRichTextStyleComboPopup, wxRichTextStyleListBox) EVT_LEFT_DOWN(wxRichTextStyleComboPopup::OnMouseClick) END_EVENT_TABLE() +bool wxRichTextStyleComboPopup::Create( wxWindow* parent ) +{ + int borderStyle = GetDefaultBorder(); + if (borderStyle == wxBORDER_SUNKEN) + borderStyle = wxBORDER_SIMPLE; + + return wxRichTextStyleListBox::Create(parent, wxID_ANY, + wxPoint(0,0), wxDefaultSize, + borderStyle); +} + void wxRichTextStyleComboPopup::SetStringValue( const wxString& s ) { m_value = SetStyleSelection(s); @@ -978,10 +1108,20 @@ bool wxRichTextStyleComboCtrl::Create(wxWindow* parent, wxWindowID id, const wxP void wxRichTextStyleComboCtrl::OnIdle(wxIdleEvent& event) { - if (GetRichTextCtrl() && !IsPopupShown() && m_stylePopup && wxWindow::FindFocus() != this) + event.Skip(); + + if ( !m_stylePopup ) + return; + + wxRichTextCtrl * const richtext = GetRichTextCtrl(); + if ( !richtext ) + return; + + if ( !IsPopupShown() && wxWindow::FindFocus() != this ) { - wxString styleName = wxRichTextStyleListBox::GetStyleToShowInIdleTime(GetRichTextCtrl(), m_stylePopup->GetStyleType()); - + wxString styleName = + wxRichTextStyleListBox::GetStyleToShowInIdleTime(richtext, m_stylePopup->GetStyleType()); + wxString currentValue = GetValue(); if (!styleName.IsEmpty()) { @@ -994,7 +1134,6 @@ void wxRichTextStyleComboCtrl::OnIdle(wxIdleEvent& event) else if (!currentValue.IsEmpty()) SetValue(wxEmptyString); } - event.Skip(); } #endif @@ -1005,4 +1144,3 @@ void wxRichTextStyleComboCtrl::OnIdle(wxIdleEvent& event) #endif // wxUSE_RICHTEXT -