From 666e33ab46ed911cd94513c43fcc2bb191704000 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 18 May 2007 15:21:47 +0000 Subject: [PATCH] do use the font in DoGetTextExtent() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/metafile.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp index 29c08d30f2..2186f3ef18 100644 --- a/src/msw/metafile.cpp +++ b/src/msw/metafile.cpp @@ -218,14 +218,13 @@ void wxMetafileDC::DoGetTextExtent(const wxString& string, if (!fontToUse) fontToUse = &m_font; - HDC dc = GetDC(NULL); + ScreenHDC dc; + SelectInHDC selFont(dc, GetHfontOf(*fontToUse)); SIZE sizeRect; TEXTMETRIC tm; ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect); - GetTextMetrics(dc, &tm); - - ReleaseDC(NULL, dc); + ::GetTextMetrics(dc, &tm); if ( x ) *x = sizeRect.cx; -- 2.45.2