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

Fix sizing in wxMarkupParserRenderItemOutput::OnText

Browse Source 
Pass the text without mnemonics to GetTextExtent().
This commit is contained in:
Václav Slavík
2017-02-14 12:12:35 +01:00
parent 8af97d8db3
commit 889b406b0e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/markuptext.cpp
View File

@@ -253,8 +253,10 @@ public:
m_ellipsizeMode = ellipsizeMode == wxELLIPSIZE_NONE ? wxELLIPSIZE_NONE : wxELLIPSIZE_END; m_ellipsizeMode = ellipsizeMode == wxELLIPSIZE_NONE ? wxELLIPSIZE_NONE : wxELLIPSIZE_END;
} }
virtual void OnText(const wxString& text) wxOVERRIDE virtual void OnText(const wxString& text_) wxOVERRIDE
{ {
const wxString text(wxControl::RemoveMnemonics(text_));
wxRect rect(m_rect); wxRect rect(m_rect);
rect.x = m_pos; rect.x = m_pos;
rect.SetRight(m_rect.GetRight()); rect.SetRight(m_rect.GetRight());
@@ -286,7 +288,7 @@ public:
m_renderer->DrawItemText(m_win, m_renderer->DrawItemText(m_win,
m_dc, m_dc,
wxControl::RemoveMnemonics(text), text,
rect, rect,
wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL, wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL,
m_rendererFlags, m_rendererFlags,