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

Remove MSW wxUxThemeEngine class

Browse Source 
This undocumented "private" class was used for various windows UxTheme
functions which are available since WinXP. As wxWidgets 3.1 is XP+ it
does not make sense anymore to load the theme functions dynamically.
This commit is contained in:
Tobias Taschner
2017-10-27 20:55:40 +02:00
parent ce90336dff
commit ddceaab001
256 changed files with 478 additions and 1034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/msw/window.cpp
View File

@@ -1461,8 +1461,7 @@ wxBorder wxWindowMSW::TranslateBorder(wxBorder border) const
{
if (CanApplyThemeBorder())
{
wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
if (theme)
if ( wxUxThemeIsActive() )
return wxBORDER_THEME;
}
return wxBORDER_SUNKEN;
@@ -3647,9 +3646,8 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
// If we want the default themed border then we need to draw it ourselves
case WM_NCCALCSIZE:
{
wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
const wxBorder border = TranslateBorder(GetBorder());
if (theme && border == wxBORDER_THEME)
if (wxUxThemeIsActive() && border == wxBORDER_THEME)
{
// first ask the widget to calculate the border size
rc.result = MSWDefWindowProc(message, wParam, lParam);
@@ -3674,7 +3672,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
wxClientDC dc((wxWindow *)this);
wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
if ( theme->GetThemeBackgroundContentRect
if ( ::GetThemeBackgroundContentRect
(
hTheme,
GetHdcOf(*impl),
@@ -3699,9 +3697,8 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
case WM_NCPAINT:
{
wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
const wxBorder border = TranslateBorder(GetBorder());
if (theme && border == wxBORDER_THEME)
if (wxUxThemeIsActive() && border == wxBORDER_THEME)
{
// first ask the widget to paint its non-client area, such as scrollbars, etc.
rc.result = MSWDefWindowProc(message, wParam, lParam);
@@ -3716,7 +3713,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
wxCopyRectToRECT(GetSize(), rcBorder);
RECT rcClient;
theme->GetThemeBackgroundContentRect(
::GetThemeBackgroundContentRect(
hTheme, GetHdcOf(*impl), EP_EDITTEXT, ETS_NORMAL, &rcBorder, &rcClient);
InflateRect(&rcClient, -1, -1);
@@ -3724,9 +3721,9 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
rcClient.right, rcClient.bottom);
// Make sure the background is in a proper state
if (theme->IsThemeBackgroundPartiallyTransparent(hTheme, EP_EDITTEXT, ETS_NORMAL))
if (::IsThemeBackgroundPartiallyTransparent(hTheme, EP_EDITTEXT, ETS_NORMAL))
{
theme->DrawThemeParentBackground(GetHwnd(), GetHdcOf(*impl), &rcBorder);
::DrawThemeParentBackground(GetHwnd(), GetHdcOf(*impl), &rcBorder);
}
// Draw the border
@@ -3738,7 +3735,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
// nState = ETS_READONLY;
else
nState = ETS_NORMAL;
theme->DrawThemeBackground(hTheme, GetHdcOf(*impl), EP_EDITTEXT, nState, &rcBorder, NULL);
::DrawThemeBackground(hTheme, GetHdcOf(*impl), EP_EDITTEXT, nState, &rcBorder, NULL);
}
}
break;
@@ -4846,8 +4843,7 @@ wxColour wxWindowMSW::MSWGetThemeColour(const wchar_t *themeName,
wxSystemColour fallback) const
{
#if wxUSE_UXTHEME
const wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
if ( theme )
if ( wxUxThemeIsActive() )
{
int themeProperty = 0;
@@ -4869,7 +4865,7 @@ wxColour wxWindowMSW::MSWGetThemeColour(const wchar_t *themeName,
wxUxThemeHandle hTheme((const wxWindow *)this, themeName);
COLORREF col;
HRESULT hr = theme->GetThemeColor
HRESULT hr = ::GetThemeColor
(
hTheme,
themePart,