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

do use the font in DoGetTextExtent()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-05-18 15:21:47 +00:00
parent 802e382ff1
commit 666e33ab46
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/metafile.cpp
View File

@@ -218,14 +218,13 @@ void wxMetafileDC::DoGetTextExtent(const wxString& string,
if (!fontToUse) if (!fontToUse)
fontToUse = &m_font; fontToUse = &m_font;
HDC dc = GetDC(NULL); ScreenHDC dc;
SelectInHDC selFont(dc, GetHfontOf(*fontToUse));
SIZE sizeRect; SIZE sizeRect;
TEXTMETRIC tm; TEXTMETRIC tm;
::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect); ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
GetTextMetrics(dc, &tm); ::GetTextMetrics(dc, &tm);
ReleaseDC(NULL, dc);
if ( x ) if ( x )
*x = sizeRect.cx; *x = sizeRect.cx;