AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Determine correct checkbox size when using theme.

Browse Source
This commit is contained in:
Maarten Bent 2015-12-16 20:59:27 +01:00
parent dd29ecf840
commit 64c4e0674c
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/generic/datavgen.cpp
View File

@ -1152,9 +1152,7 @@ bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cellRect),
wxSize wxDataViewToggleRenderer::GetSize() const
{
// the window parameter is not used by GetCheckBoxSize() so it's
// safe to pass NULL
return wxRendererNative::Get().GetCheckBoxSize(NULL);
return wxRendererNative::Get().GetCheckBoxSize(GetView());
}
// ---------------------------------------------------------

4
src/generic/renderg.cpp
View File

@ -712,9 +712,9 @@ wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win),
}
}
wxSize wxRendererGeneric::GetCheckBoxSize(wxWindow *WXUNUSED(win))
wxSize wxRendererGeneric::GetCheckBoxSize(wxWindow *win)
{
return wxSize(16, 16);
return win->FromDIP(wxSize(16, 16));
}
void

17
src/msw/renderer.cpp
View File

@ -327,6 +327,8 @@ public:
wxTitleBarButton button,
int flags = 0);
virtual wxSize GetCheckBoxSize(wxWindow *win);
virtual void DrawGauge(wxWindow* win,
wxDC& dc,
const wxRect& rect,
@ -902,6 +904,21 @@ wxRendererXP::DrawTitleBarBitmap(wxWindow *win,
DoDrawButtonLike(hTheme, part, dc, rect, flags);
}
wxSize wxRendererXP::GetCheckBoxSize(wxWindow* win)
{
wxUxThemeHandle hTheme(win, L"BUTTON");
wxUxThemeEngine* const te = wxUxThemeEngine::Get();
if (te->IsThemePartDefined(hTheme, BP_CHECKBOX, 0))
{
SIZE checkSize;
te->GetThemePartSize(hTheme, NULL, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, NULL, TS_DRAW, &checkSize);
return wxSize(checkSize.cx, checkSize.cy);
}
else
return m_rendererNative.GetCheckBoxSize(win);
}
void
wxRendererXP::DrawCollapseButton(wxWindow *win,
wxDC& dc,