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

Don't check for DrawThemeTextEx availability every DrawItemText()

Browse Source 
Check for DrawThemeTextEx availability only once, which also seems to be
what ddceaab001 (Remove MSW wxUxThemeEngine class, 2017-10-27) intended
to do here by already introducing a static function pointer. Simply add
an init guard, also because the repeated check is not a cheap operation
(judging by comparing performance with drawing short texts).

Closes https://github.com/wxWidgets/wxWidgets/pull/2196
This commit is contained in:
Dimitri Schoolwerth
2021-01-27 00:47:21 +01:00
committed by Vadim Zeitlin
parent 1fed80f9b1
commit ddec29c338
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/renderer.cpp
View File

@@ -1044,11 +1044,17 @@ void wxRendererXP::DrawItemText(wxWindow* win,
typedef HRESULT(__stdcall *DrawThemeTextEx_t)(HTHEME, HDC, int, int, const wchar_t *, int, DWORD, RECT *, const WXDTTOPTS *);
static DrawThemeTextEx_t s_DrawThemeTextEx = NULL;
static bool s_initDone = false;
if (wxGetWinVersion() >= wxWinVersion_Vista)
if ( !s_initDone )
{
wxLoadedDLL dllUxTheme(wxS("uxtheme.dll"));
wxDL_INIT_FUNC(s_, DrawThemeTextEx, dllUxTheme);
if (wxGetWinVersion() >= wxWinVersion_Vista)
{
wxLoadedDLL dllUxTheme(wxS("uxtheme.dll"));
wxDL_INIT_FUNC(s_, DrawThemeTextEx, dllUxTheme);
}
s_initDone = true;
}
if ( s_DrawThemeTextEx && // Might be not available if we're under XP