From c8b1284f7e44e3b6c396c72daf1f68a0d1b671ca Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 26 Nov 2010 16:31:44 +0000 Subject: [PATCH] Allow bullet style to be switched off via the UI git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@66266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbulletspage.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/richtext/richtextbulletspage.cpp b/src/richtext/richtextbulletspage.cpp index 9e01f1fa26..73af03a529 100644 --- a/src/richtext/richtextbulletspage.cpp +++ b/src/richtext/richtextbulletspage.cpp @@ -318,11 +318,24 @@ bool wxRichTextBulletsPage::TransferDataFromWindow() wxTextAttrEx* attr = GetAttributes(); + int index = m_styleListBox->GetSelection(); + if (index < 1) + { + m_hasBulletStyle = false; + m_hasBulletNumber = false; + m_hasBulletSymbol = false; + attr->SetBulletStyle(wxTEXT_ATTR_BULLET_STYLE_NONE); + attr->SetFlags(attr->GetFlags() & ~(wxTEXT_ATTR_BULLET_STYLE|wxTEXT_ATTR_BULLET_NUMBER|wxTEXT_ATTR_BULLET_TEXT|wxTEXT_ATTR_BULLET_NAME)); + } + else + { + m_hasBulletStyle = true; + } + if (m_hasBulletStyle) { long bulletStyle = wxRICHTEXT_BULLETINDEX_NONE; - int index = m_styleListBox->GetSelection(); if (index == wxRICHTEXT_BULLETINDEX_ARABIC) bulletStyle |= wxTEXT_ATTR_BULLET_STYLE_ARABIC;