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

Added wxWindowMSW::MSWGetThemeColour(); initially use it in wxComboCtrl::OnThemeChange()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-12-19 14:47:37 +00:00
parent bc0f253462
commit a5b1be33b7
3 changed files with 81 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/msw/window.cpp
View File

@@ -4701,6 +4701,64 @@ extern wxCOLORMAP *wxGetStdColourMap()
return s_cmap;
}
#if wxUSE_UXTHEME && !defined(TMT_FILLCOLOR)
#define TMT_FILLCOLOR 3802
#define TMT_TEXTCOLOR 3803
#define TMT_BORDERCOLOR 3801
#endif
wxColour wxWindowMSW::MSWGetThemeColour(const wchar_t *themeName,
int themePart,
int themeState,
MSWThemeColour themeColour,
wxSystemColour fallback)
{
#if wxUSE_UXTHEME
const wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
if ( theme )
{
int themeProperty = 0;
// TODO: Convert this into a table? Sure would be faster.
switch ( themeColour )
{
case ThemeColourBackground:
themeProperty = TMT_FILLCOLOR;
break;
case ThemeColourText:
themeProperty = TMT_TEXTCOLOR;
break;
case ThemeColourBorder:
themeProperty = TMT_BORDERCOLOR;
break;
default:
wxFAIL_MSG(wxT("unsupported theme colour"));
};
wxUxThemeHandle hTheme(this, themeName);
COLORREF col;
HRESULT hr = theme->GetThemeColor
(
hTheme,
themePart,
themeState,
themeProperty,
&col
);
if ( SUCCEEDED(hr) )
return wxRGBToColour(col);
wxLogApiError(
wxString::Format(
"GetThemeColor(%s, %i, %i, %i)",
themeName, themePart, themeState, themeProperty),
hr);
}
#endif
return wxSystemSettings::GetColour(fallback);
}
// ---------------------------------------------------------------------------
// painting
// ---------------------------------------------------------------------------