From 63415ba9f5331b2b96215f8a570e05623ea6ec42 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 18 Oct 2011 21:56:36 +0000 Subject: [PATCH] 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 --- include/wx/textwrapper.h | 4 +++- src/common/dlgcmn.cpp | 8 +------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/wx/textwrapper.h b/include/wx/textwrapper.h index bf4991f7f4..8fe58fb13a 100644 --- 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 6b70e66e97..d95dafd786 100644 --- 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 -- 2.50.0