Further style preview fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -405,14 +405,14 @@ bool wxRichTextStyleOrganiserDialog::TransferDataToWindow()
|
|||||||
void wxRichTextStyleOrganiserDialog::ShowPreview(int sel)
|
void wxRichTextStyleOrganiserDialog::ShowPreview(int sel)
|
||||||
{
|
{
|
||||||
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_para2List = wxT("Duis pharetra consequat dui. Nullam vitae justo id mauris lobortis interdum.");
|
static const wxChar* s_para2List = wxT("Duis pharetra consequat dui. Nullam vitae justo id mauris lobortis interdum.\n");
|
||||||
|
|
||||||
static const wxChar* s_para2 = wxT("Duis 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");
|
||||||
|
|
||||||
if (sel == -1)
|
if (sel == -1)
|
||||||
@@ -458,7 +458,7 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n");
|
|||||||
wxTextAttr levelAttr = * listDef->GetLevelAttributes(i);
|
wxTextAttr levelAttr = * listDef->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_para2List);
|
m_previewCtrl->WriteText(wxString::Format(wxT("List level %d. "), i+1) + s_para2List);
|
||||||
m_previewCtrl->EndStyle();
|
m_previewCtrl->EndStyle();
|
||||||
}
|
}
|
||||||
long listEnd = m_previewCtrl->GetInsertionPoint();
|
long listEnd = m_previewCtrl->GetInsertionPoint();
|
||||||
@@ -466,7 +466,7 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n");
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_previewCtrl->WriteText(wxString(wxT("\n")) + s_para2);
|
m_previewCtrl->WriteText(s_para2);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_previewCtrl->EndStyle();
|
m_previewCtrl->EndStyle();
|
||||||
|
Reference in New Issue
Block a user