Reverted format changes since 2.9 works differently

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/richtext/richtextstyledlg.cpp b/src/richtext/richtextstyledlg.cpp
index 6d7d3c3bdd2c70bb115a65deea65442d345f77f8..40705cff21c5b30f2336ab936493f779489179a2 100644 (file)
--- a/src/richtext/richtextstyledlg.cpp
+++ b/src/richtext/richtextstyledlg.cpp
@@ -784,7 +784,7 @@ void wxRichTextStyleOrganiserDialog::OnDeleteClick( wxCommandEvent& WXUNUSED(eve
     {
         wxRichTextStyleDefinition* def = m_stylesListBox->GetStyleListBox()->GetStyle(sel);
         wxString name(def->GetName());
-        if (wxYES == wxMessageBox(wxString::Format(_("Delete style %s?"), name.c_str()), _("Delete Style"), wxYES_NO|wxICON_QUESTION, this))
+        if (wxYES == wxMessageBox(wxString::Format(_("Delete style %s?"), name), _("Delete Style"), wxYES_NO|wxICON_QUESTION, this))
         {
             m_stylesListBox->GetStyleListBox()->SetItemCount(0);
 

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 263ea7f58ba6abe048862b7aa25348bc71a2eca8..4157ec55057a2e90abd97e5e1c17a4bf928acc6a 100644 (file)
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -875,7 +875,7 @@ bool wxRichTextXMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
 
     wxString s ;
     s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),
-             version.c_str(), fileEncoding.c_str());
+             version, fileEncoding);
     OutputString(stream, s);
     OutputString(stream, wxT("<richtext version=\"1.0.0.0\" xmlns=\"http://www.wxwidgets.org\">"));