Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't interpret '&' specially in wxTextWrapper.

Browse Source 
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:
Vadim Zeitlin
2011-10-18 21:56:36 +00:00
parent 6a68fe84ba
commit 63415ba9f5
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/textwrapper.h
View File

@@ -98,7 +98,9 @@ public:
protected: protected:
virtual wxWindow *OnCreateLine(const wxString& line) 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) virtual void OnOutputLine(const wxString& line)

8
src/common/dlgcmn.cpp
View File

@@ -224,13 +224,7 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message,
widthMax = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25; widthMax = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25;
} }
// '&' is used as accel mnemonic prefix in the wxWidgets controls but in return wrapper.CreateSizer(message, widthMax);
// 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);
} }
#endif // wxUSE_STATTEXT #endif // wxUSE_STATTEXT