AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow using wxDEFAULT as font size in wxOSX.

Browse Source 
Using wxDEFAULT as the font size in wxOSX resulted in creating 70pt font,
change this to use the normal font size instead for compatibility with the
other platforms.

Also allow using -1 as wxDEFAULT for compatibility with wxGTK, see #12541.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-04-30 10:27:32 +00:00
parent 039d4cfb78
commit 659ca93c42
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1112,7 +1112,16 @@ void wxNativeFontInfo::Init(int size,
wxFontEncoding encoding)
{
Init();
m_pointSize = size;
// We should use the default font size if the special value wxDEFAULT is
// specified and we also handle -1 as a synonym for wxDEFAULT for
// compatibility with wxGTK (see #12541).
//
// Notice that we rely on the fact that wxNORMAL_FONT itself is not
// initialized using this ctor, but from native font info.
m_pointSize = size == -1 || size == wxDEFAULT
? wxNORMAL_FONT->GetPointSize()
: size;
m_family = family;
m_style = style;
m_weight = weight;