From 2d17baae34e212fd96e3a0d6f6baad417f89ca27 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 2 Jul 2004 19:38:13 +0000 Subject: [PATCH] BCC compilation fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/window.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 93bb8f27c8..345427d25a 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -1671,7 +1671,11 @@ void wxWindowMSW::GetTextExtent(const wxString& string, wxASSERT_MSG( !theFont || theFont->Ok(), _T("invalid font in GetTextExtent()") ); - const wxFont fontToUse(theFont ? *theFont : GetFont()); + wxFont fontToUse; + if (theFont) + fontToUse = *theFont; + else + fontToUse = GetFont(); WindowHDC hdc(GetHwnd()); SelectInHDC selectFont(hdc, GetHfontOf(fontToUse)); -- 2.45.2