- Merge Giannis's explorer leak fix from r74437. CORE-13155

svn path=/branches/ros-branch-0_4_5/; revision=74453
This commit is contained in:
Thomas Faber 2017-05-03 11:06:04 +00:00
parent 798f8e1476
commit 1250231f85

View file

@ -714,20 +714,19 @@ public:
0,
TMT_TEXTCOLOR,
&textColor);
if (this->hFont != NULL)
DeleteObject(this->hFont);
SetFont(hFont, FALSE);
}
else
{
NONCLIENTMETRICS ncm = { 0 };
ncm.cbSize = sizeof(ncm);
SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE);
hFont = CreateFontIndirectW(&ncm.lfMessageFont);
/* We don't need to set a font here, our parent will use
* WM_SETFONT to set the right one when themes are not enabled. */
textColor = RGB(0, 0, 0);
}
SetFont(hFont, FALSE);
CloseThemeData(clockTheme);
return TRUE;