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

Add wxDC::GetFontMetrics() and implement it for wxMSW.

Browse Source 
Add a new wxDC method allowing to retrieve the font characteristics not
available from GetTextExtent(), notably the internal leading (and also the
average font width).

Currently this is implemented for wxMSW only, the internal leading is always 0
in the other ports.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-02-27 12:48:13 +00:00
parent f5bdfc69a5
commit e29bf4b056
5 changed files with 132 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/msw/dc.cpp
View File

@@ -1722,6 +1722,31 @@ wxCoord wxMSWDCImpl::GetCharWidth() const
return lpTextMetric.tmAveCharWidth;
}
void wxMSWDCImpl::DoGetFontMetrics(int *height,
int *ascent,
int *descent,
int *internalLeading,
int *externalLeading,
int *averageWidth) const
{
TEXTMETRIC tm;
GetTextMetrics(GetHdc(), &tm);
if ( height )
*height = tm.tmHeight;
if ( ascent )
*ascent = tm.tmAscent;
if ( descent )
*descent = tm.tmDescent;
if ( internalLeading )
*internalLeading = tm.tmInternalLeading;
if ( externalLeading )
*externalLeading = tm.tmExternalLeading;
if ( averageWidth )
*averageWidth = tm.tmAveCharWidth;
}
void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
wxCoord *descent, wxCoord *externalLeading,
const wxFont *font) const
@@ -1791,13 +1816,7 @@ void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
if ( descent || externalLeading )
{
TEXTMETRIC tm;
::GetTextMetrics(GetHdc(), &tm);
if (descent)
*descent = tm.tmDescent;
if (externalLeading)
*externalLeading = tm.tmExternalLeading;
DoGetFontMetrics(NULL, NULL, descent, NULL, externalLeading, NULL);
}
if ( hfontOld )