removed 2.0 compatibility stuff (patch 1054261)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -506,16 +506,11 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
|
||||
|
||||
void wxNativeFontInfo::SetPointSize(int pointsize)
|
||||
{
|
||||
#if wxFONT_SIZE_COMPATIBILITY
|
||||
// Incorrect, but compatible with old wxWidgets behaviour
|
||||
lf.lfHeight = (pointSize*ppInch)/72;
|
||||
#else // wxFONT_SIZE_COMPATIBILITY
|
||||
// FIXME: using the screen here results in incorrect font size calculation
|
||||
// for printing!
|
||||
const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
|
||||
|
||||
lf.lfHeight = -(int)((pointsize*((double)ppInch)/72.0) + 0.5);
|
||||
#endif // wxFONT_SIZE_COMPATIBILITY/!wxFONT_SIZE_COMPATIBILITY
|
||||
}
|
||||
|
||||
void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
|
||||
|
Reference in New Issue
Block a user