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

Make use of strike-through when creating an ATSU font

Browse Source 
This makes the wxTextCtrl in the font sample under OS X support showing
a stricken-through font when using ATSU (which by default is used by
OSX/Carbon). It doesn't work for other controls such as a wxButton and
wxStaticText but at least it's a slight improvement from only working
with DrawText (which was added in 9ecf3170).
This commit is contained in:
Dimitri Schoolwerth
2015-05-22 03:12:41 +04:00
parent d601e0efd8
commit cc81acecc1
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osx/carbon/font.cpp
View File

@@ -409,6 +409,7 @@ void wxFontRefData::CreateATSUFont()
kATSUQDUnderlineTag , kATSUQDUnderlineTag ,
kATSUQDCondensedTag , kATSUQDCondensedTag ,
kATSUQDExtendedTag , kATSUQDExtendedTag ,
kATSUStyleStrikeThroughTag
}; };
ByteCount atsuSizes[WXSIZEOF(atsuTags)] = ByteCount atsuSizes[WXSIZEOF(atsuTags)] =
{ {
@@ -420,6 +421,7 @@ void wxFontRefData::CreateATSUFont()
sizeof( Boolean ) , sizeof( Boolean ) ,
sizeof( Boolean ) , sizeof( Boolean ) ,
sizeof( Boolean ) , sizeof( Boolean ) ,
sizeof( Boolean )
}; };
Boolean kTrue = true ; Boolean kTrue = true ;
@@ -438,6 +440,7 @@ void wxFontRefData::CreateATSUFont()
(addQDStyle & underline) ? &kTrue : &kFalse , (addQDStyle & underline) ? &kTrue : &kFalse ,
(addQDStyle & condense) ? &kTrue : &kFalse , (addQDStyle & condense) ? &kTrue : &kFalse ,
(addQDStyle & extend) ? &kTrue : &kFalse , (addQDStyle & extend) ? &kTrue : &kFalse ,
m_info.m_strikethrough ? & kTrue : &kFalse
}; };
status = ::ATSUSetAttributes( status = ::ATSUSetAttributes(