From bbe61adae8197486d1d0d321c6490ee3dd7630d0 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 16 Dec 2015 21:01:46 +0100 Subject: [PATCH] Use IsThemePartDefined according to the specification. iStateId should always be 0 (https://msdn.microsoft.com/en-us/library/windows/desktop/bb759819%28v=vs.85%29.aspx). --- src/msw/renderer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index 080b5a141d..429d7c884d 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -939,7 +939,7 @@ wxRendererXP::DrawCollapseButton(wxWindow *win, if ( flags & wxCONTROL_EXPANDED ) state += 3; - if ( te->IsThemePartDefined(hTheme, TDLG_EXPANDOBUTTON, state) ) + if ( te->IsThemePartDefined(hTheme, TDLG_EXPANDOBUTTON, 0) ) { if (flags & wxCONTROL_EXPANDED) flags |= wxCONTROL_CHECKED; @@ -970,7 +970,7 @@ wxSize wxRendererXP::GetCollapseButtonSize(wxWindow *win, wxDC& dc) // EXPANDOBUTTON scales ugly if not using the correct size, get size from theme - if ( te->IsThemePartDefined(hTheme, TDLG_EXPANDOBUTTON, TDLGEBS_NORMAL) ) + if ( te->IsThemePartDefined(hTheme, TDLG_EXPANDOBUTTON, 0) ) { SIZE s; te->GetThemePartSize(hTheme, @@ -998,7 +998,7 @@ wxRendererXP::DrawItemSelectionRect(wxWindow *win, const int itemState = GetListItemState(flags); wxUxThemeEngine* const te = wxUxThemeEngine::Get(); - if ( te->IsThemePartDefined(hTheme, LVP_LISTITEM, itemState) ) + if ( te->IsThemePartDefined(hTheme, LVP_LISTITEM, 0) ) { RECT rc; wxCopyRectToRECT(rect, rc); @@ -1027,7 +1027,7 @@ void wxRendererXP::DrawItemText(wxWindow* win, wxUxThemeEngine* te = wxUxThemeEngine::Get(); if ( te->DrawThemeTextEx && // Might be not available if we're under XP - te->IsThemePartDefined(hTheme, LVP_LISTITEM, itemState) ) + te->IsThemePartDefined(hTheme, LVP_LISTITEM, 0) ) { RECT rc; wxCopyRectToRECT(rect, rc);