Don't interpret '&' specially in wxTextWrapper.

wxTextWrapper is used for the multiline text for which it doesn't make sense
to use mnemonics so don't interpret '&' specially in the text used with it.

Doing this also allows to remove the hack used in wxDialog::CreateTextSizer()
to deal with it that was used so far.

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

diff --git a/include/wx/textwrapper.h b/include/wx/textwrapper.h
index bf4991f7f45aa912af853d079486132b07903e79..8fe58fb13a6aead2489606ab39c99b14fc5f1589 100644 (file)
--- a/include/wx/textwrapper.h
+++ b/include/wx/textwrapper.h
@@ -98,7 +98,9 @@ public:
 protected:
     virtual wxWindow *OnCreateLine(const wxString& line)
     {
-        return new wxStaticText(m_win, wxID_ANY, line);
+        wxStaticText* const win = new wxStaticText(m_win, wxID_ANY, "");
+        win->SetLabelText(line);
+        return win;
     }
 
     virtual void OnOutputLine(const wxString& line)

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 6b70e66e97ab4c113ce7392a4cf0ac41da81e175..d95dafd786f832ecaee0351a8096f8840e7a2c0e 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -224,13 +224,7 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message,
         widthMax = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25;
     }
 
-    // '&' is used as accel mnemonic prefix in the wxWidgets controls but in
-    // the static messages created by CreateTextSizer() (used by wxMessageBox,
-    // for example), we don't want this special meaning, so we need to quote it
-    wxString text(message);
-    text.Replace(wxT("&"), wxT("&&"));
-
-    return wrapper.CreateSizer(text, widthMax);
+    return wrapper.CreateSizer(message, widthMax);
 }
 
 #endif // wxUSE_STATTEXT