Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected problem of wrong paragraph receiving style in formatting dialog.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2008-06-29 17:04:04 +00:00
parent c3f80e6c6b
commit d9b78cd63d
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/richtext/richtextbulletspage.cpp
View File

@@ -481,12 +481,12 @@ bool wxRichTextBulletsPage::TransferDataToWindow()
void wxRichTextBulletsPage::UpdatePreview() void wxRichTextBulletsPage::UpdatePreview()
{ {
static const wxChar* s_para1 = wxT("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. \ static const wxChar* s_para1 = wxT("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. \
Nullam ante sapien, vestibulum nonummy, pulvinar sed, luctus ut, lacus."); Nullam ante sapien, vestibulum nonummy, pulvinar sed, luctus ut, lacus.\n");
static const wxChar* s_para2 = wxT("\nDuis pharetra consequat dui. Cum sociis natoque penatibus \ static const wxChar* s_para2 = wxT("Duis pharetra consequat dui. Cum sociis natoque penatibus \
et magnis dis parturient montes, nascetur ridiculus mus. Nullam vitae justo id mauris lobortis interdum."); et magnis dis parturient montes, nascetur ridiculus mus. Nullam vitae justo id mauris lobortis interdum.\n");
static const wxChar* s_para3 = wxT("\nInteger convallis dolor at augue \ static const wxChar* s_para3 = wxT("Integer convallis dolor at augue \
iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n"); iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n");
TransferDataFromWindow(); TransferDataFromWindow();

12
src/richtext/richtextindentspage.cpp
View File

@@ -341,12 +341,12 @@ wxTextAttrEx* wxRichTextIndentsSpacingPage::GetAttributes()
void wxRichTextIndentsSpacingPage::UpdatePreview() void wxRichTextIndentsSpacingPage::UpdatePreview()
{ {
static const wxChar* s_para1 = wxT("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. \ static const wxChar* s_para1 = wxT("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. \
Nullam ante sapien, vestibulum nonummy, pulvinar sed, luctus ut, lacus."); Nullam ante sapien, vestibulum nonummy, pulvinar sed, luctus ut, lacus.\n");
static const wxChar* s_para2 = wxT("\nDuis pharetra consequat dui. Cum sociis natoque penatibus \ static const wxChar* s_para2 = wxT("Duis pharetra consequat dui. Cum sociis natoque penatibus \
et magnis dis parturient montes, nascetur ridiculus mus. Nullam vitae justo id mauris lobortis interdum."); et magnis dis parturient montes, nascetur ridiculus mus. Nullam vitae justo id mauris lobortis interdum.\n");
static const wxChar* s_para3 = wxT("\nInteger convallis dolor at augue \ static const wxChar* s_para3 = wxT("Integer convallis dolor at augue \
iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n"); iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n");
TransferDataFromWindow(); TransferDataFromWindow();
@@ -448,7 +448,7 @@ bool wxRichTextIndentsSpacingPage::TransferDataFromWindow()
attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_LINE_SPACING)); attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_LINE_SPACING));
else else
attr->SetLineSpacing(lineSpacing); attr->SetLineSpacing(lineSpacing);
int outlineLevel = m_outlineLevelCtrl->GetSelection(); int outlineLevel = m_outlineLevelCtrl->GetSelection();
if (outlineLevel != wxNOT_FOUND) if (outlineLevel != wxNOT_FOUND)
attr->SetOutlineLevel(outlineLevel); attr->SetOutlineLevel(outlineLevel);
@@ -546,7 +546,7 @@ bool wxRichTextIndentsSpacingPage::TransferDataToWindow()
if (outlineLevel < 0) if (outlineLevel < 0)
outlineLevel = 0; outlineLevel = 0;
if (outlineLevel > 9) if (outlineLevel > 9)
outlineLevel = 9; outlineLevel = 9;
m_outlineLevelCtrl->SetSelection(outlineLevel); m_outlineLevelCtrl->SetSelection(outlineLevel);
} }

16
src/richtext/richtextliststylepage.cpp
View File

@@ -479,7 +479,7 @@ void wxRichTextListStylePage::CreateControls()
////@end wxRichTextListStylePage content construction ////@end wxRichTextListStylePage content construction
m_dontUpdate = true; m_dontUpdate = true;
m_styleListBox->Append(_("(None)")); m_styleListBox->Append(_("(None)"));
m_styleListBox->Append(_("Arabic")); m_styleListBox->Append(_("Arabic"));
m_styleListBox->Append(_("Upper case letters")); m_styleListBox->Append(_("Upper case letters"));
@@ -496,7 +496,7 @@ void wxRichTextListStylePage::CreateControls()
m_symbolCtrl->Append(_(">")); m_symbolCtrl->Append(_(">"));
m_symbolCtrl->Append(_("+")); m_symbolCtrl->Append(_("+"));
m_symbolCtrl->Append(_("~")); m_symbolCtrl->Append(_("~"));
wxArrayString standardBulletNames; wxArrayString standardBulletNames;
if (wxRichTextBuffer::GetRenderer()) if (wxRichTextBuffer::GetRenderer())
wxRichTextBuffer::GetRenderer()->EnumerateStandardBulletNames(standardBulletNames); wxRichTextBuffer::GetRenderer()->EnumerateStandardBulletNames(standardBulletNames);
@@ -516,16 +516,16 @@ void wxRichTextListStylePage::CreateControls()
void wxRichTextListStylePage::UpdatePreview() void wxRichTextListStylePage::UpdatePreview()
{ {
static const wxChar* s_para1 = wxT("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. \ static const wxChar* s_para1 = wxT("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. \
Nullam ante sapien, vestibulum nonummy, pulvinar sed, luctus ut, lacus."); Nullam ante sapien, vestibulum nonummy, pulvinar sed, luctus ut, lacus.\n");
static const wxChar* s_para2 = wxT("Duis pharetra consequat dui. Nullam vitae justo id mauris lobortis interdum."); static const wxChar* s_para2 = wxT("Duis pharetra consequat dui. Nullam vitae justo id mauris lobortis interdum.\n");
static const wxChar* s_para3 = wxT("\nInteger convallis dolor at augue \ static const wxChar* s_para3 = wxT("Integer convallis dolor at augue \
iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n"); iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n");
wxRichTextListStyleDefinition* def = wxDynamicCast(wxRichTextFormattingDialog::GetDialogStyleDefinition(this), wxRichTextListStyleDefinition* def = wxDynamicCast(wxRichTextFormattingDialog::GetDialogStyleDefinition(this),
wxRichTextListStyleDefinition); wxRichTextListStyleDefinition);
wxRichTextStyleSheet* styleSheet = wxRichTextFormattingDialog::GetDialog(this)->GetStyleSheet(); wxRichTextStyleSheet* styleSheet = wxRichTextFormattingDialog::GetDialog(this)->GetStyleSheet();
wxTextAttrEx attr(styleSheet ? def->GetStyle() : def->GetStyleMergedWithBase(styleSheet)); wxTextAttrEx attr(styleSheet ? def->GetStyle() : def->GetStyleMergedWithBase(styleSheet));
@@ -559,7 +559,7 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n");
wxTextAttrEx levelAttr = * def->GetLevelAttributes(i); wxTextAttrEx levelAttr = * def->GetLevelAttributes(i);
levelAttr.SetBulletNumber(1); levelAttr.SetBulletNumber(1);
m_previewCtrl->BeginStyle(levelAttr); m_previewCtrl->BeginStyle(levelAttr);
m_previewCtrl->WriteText(wxString::Format(wxT("\nList level %d. "), i+1) + s_para2); m_previewCtrl->WriteText(wxString::Format(wxT("List level %d. "), i+1) + s_para2);
m_previewCtrl->EndStyle(); m_previewCtrl->EndStyle();
} }
m_previewCtrl->EndStyle(); m_previewCtrl->EndStyle();
@@ -690,7 +690,7 @@ bool wxRichTextListStylePage::TransferDataFromWindow()
bulletStyle |= wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE; bulletStyle |= wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE;
else if (m_bulletAlignmentCtrl->GetSelection() == 2) else if (m_bulletAlignmentCtrl->GetSelection() == 2)
bulletStyle |= wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT; bulletStyle |= wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT;
// Left is implied // Left is implied
attr->SetBulletStyle(bulletStyle); attr->SetBulletStyle(bulletStyle);
} }