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
This commit is contained in:
@@ -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)
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user