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

Add validity checks to GetCheckBoxSize.

Browse Source
This commit is contained in:
Maarten Bent
2015-12-17 17:21:50 +01:00
parent 1585530623
commit 3cbdbba2fb
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/msw/renderer.cpp
View File

@@ -907,16 +907,18 @@ wxRendererXP::DrawTitleBarBitmap(wxWindow *win,
wxSize wxRendererXP::GetCheckBoxSize(wxWindow* win)
{
wxUxThemeHandle hTheme(win, L"BUTTON");
wxUxThemeEngine* const te = wxUxThemeEngine::Get();
if (te->IsThemePartDefined(hTheme, BP_CHECKBOX, 0))
if (hTheme)
{
SIZE checkSize;
te->GetThemePartSize(hTheme, NULL, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, NULL, TS_DRAW, &checkSize);
return wxSize(checkSize.cx, checkSize.cy);
wxUxThemeEngine* const te = wxUxThemeEngine::Get();
if (te && te->IsThemePartDefined(hTheme, BP_CHECKBOX, 0))
{
SIZE checkSize;
if (te->GetThemePartSize(hTheme, NULL, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, NULL, TS_DRAW, &checkSize) == S_OK)
return wxSize(checkSize.cx, checkSize.cy);
}
}
else
return m_rendererNative.GetCheckBoxSize(win);
return m_rendererNative.GetCheckBoxSize(win);
}
void