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

Fix handling of & in wxDataViewCtrl markup on wxOSX

Browse Source 
Follow up to 60bd6842e4. Apply equivalent
changes to wxMarkupToAttrString, add a new wxItemMarkupToAttrString
class for mnemonics-less strings and use it in wxDataViewTextRenderer.
This commit is contained in:
Václav Slavík
2017-05-12 16:43:21 +02:00
parent f18d14ce77
commit 11f79cda31
2 changed files with 55 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osx/cocoa/dataview.mm
View File

@@ -2956,7 +2956,7 @@ bool wxDataViewTextRenderer::MacRender()
#if wxUSE_MARKUP
if ( m_useMarkup )
{
wxMarkupToAttrString toAttr(wxFont([cell font]), GetValue().GetString());
wxItemMarkupToAttrString toAttr(wxFont([cell font]), GetValue().GetString());
NSMutableAttributedString *str = toAttr.GetNSAttributedString();
if ( [cell lineBreakMode] != NSLineBreakByClipping )