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

don't create unnecessary temporary wxFont (patch theFont)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-01-16 01:43:00 +00:00
parent 747d7d7c15
commit e044841350
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/window.cpp
View File

@@ -2128,19 +2128,19 @@ int wxWindowMSW::GetCharWidth() const
void wxWindowMSW::GetTextExtent(const wxString& string,
int *x, int *y,
int *descent, int *externalLeading,
const wxFont *theFont) const
const wxFont *fontToUse) const
{
wxASSERT_MSG( !theFont || theFont->Ok(),
wxASSERT_MSG( !fontToUse || fontToUse->Ok(),
_T("invalid font in GetTextExtent()") );
wxFont fontToUse;
if (theFont)
fontToUse = *theFont;
HFONT hfontToUse;
if ( fontToUse )
hfontToUse = GetHfontOf(*fontToUse);
else
fontToUse = GetFont();
hfontToUse = GetHfontOf(GetFont());
WindowHDC hdc(GetHwnd());
SelectInHDC selectFont(hdc, GetHfontOf(fontToUse));
SelectInHDC selectFont(hdc, hfontToUse);
SIZE sizeRect;
TEXTMETRIC tm;