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

BCC compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-07-02 19:38:13 +00:00
parent d23a4aa781
commit 2d17baae34
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/window.cpp
View File

@@ -1671,7 +1671,11 @@ void wxWindowMSW::GetTextExtent(const wxString& string,
wxASSERT_MSG( !theFont || theFont->Ok(), wxASSERT_MSG( !theFont || theFont->Ok(),
_T("invalid font in GetTextExtent()") ); _T("invalid font in GetTextExtent()") );
const wxFont fontToUse(theFont ? *theFont : GetFont()); wxFont fontToUse;
if (theFont)
fontToUse = *theFont;
else
fontToUse = GetFont();
WindowHDC hdc(GetHwnd()); WindowHDC hdc(GetHwnd());
SelectInHDC selectFont(hdc, GetHfontOf(fontToUse)); SelectInHDC selectFont(hdc, GetHfontOf(fontToUse));