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
This commit is contained in:
@@ -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;
|
||||
|
||||
|
Reference in New Issue
Block a user