X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fce6547622ff5f9e4ec31372b0f6172e87edefa..b5a9b87e1620e52f1f13d2619b4677f2b365c93f:/src/richtext/richtextstyledlg.cpp?ds=sidebyside diff --git a/src/richtext/richtextstyledlg.cpp b/src/richtext/richtextstyledlg.cpp index 9f76c237eb..5c7c85af92 100644 --- a/src/richtext/richtextstyledlg.cpp +++ b/src/richtext/richtextstyledlg.cpp @@ -405,14 +405,14 @@ bool wxRichTextStyleOrganiserDialog::TransferDataToWindow() void wxRichTextStyleOrganiserDialog::ShowPreview(int sel) { 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 \ -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"); if (sel == -1) @@ -458,7 +458,7 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n"); wxTextAttr levelAttr = * listDef->GetLevelAttributes(i); levelAttr.SetBulletNumber(1); 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(); } long listEnd = m_previewCtrl->GetInsertionPoint(); @@ -466,7 +466,7 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n"); } else { - m_previewCtrl->WriteText(wxString(wxT("\n")) + s_para2); + m_previewCtrl->WriteText(s_para2); } m_previewCtrl->EndStyle(); @@ -705,6 +705,7 @@ void wxRichTextStyleOrganiserDialog::OnEditClick( wxCommandEvent& WXUNUSED(event } m_stylesListBox->UpdateStyles(); + m_stylesListBox->GetStyleListBox()->SetSelection(sel); ShowPreview(); } }