Make wxWindow::MSWGetThemeColour() const.
There doesn't seem to be any reason for this method to not be const. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -428,7 +428,7 @@ public:
|
|||||||
int themePart,
|
int themePart,
|
||||||
int themeState,
|
int themeState,
|
||||||
MSWThemeColour themeColour,
|
MSWThemeColour themeColour,
|
||||||
wxSystemColour fallback);
|
wxSystemColour fallback) const;
|
||||||
|
|
||||||
// gives the parent the possibility to draw its children background, e.g.
|
// gives the parent the possibility to draw its children background, e.g.
|
||||||
// this is used by wxNotebook to do it using DrawThemeBackground()
|
// this is used by wxNotebook to do it using DrawThemeBackground()
|
||||||
|
@@ -4739,7 +4739,7 @@ wxColour wxWindowMSW::MSWGetThemeColour(const wchar_t *themeName,
|
|||||||
int themePart,
|
int themePart,
|
||||||
int themeState,
|
int themeState,
|
||||||
MSWThemeColour themeColour,
|
MSWThemeColour themeColour,
|
||||||
wxSystemColour fallback)
|
wxSystemColour fallback) const
|
||||||
{
|
{
|
||||||
#if wxUSE_UXTHEME
|
#if wxUSE_UXTHEME
|
||||||
const wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
|
const wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
|
||||||
@@ -4763,7 +4763,7 @@ wxColour wxWindowMSW::MSWGetThemeColour(const wchar_t *themeName,
|
|||||||
wxFAIL_MSG(wxT("unsupported theme colour"));
|
wxFAIL_MSG(wxT("unsupported theme colour"));
|
||||||
};
|
};
|
||||||
|
|
||||||
wxUxThemeHandle hTheme((wxWindow *)this, themeName);
|
wxUxThemeHandle hTheme((const wxWindow *)this, themeName);
|
||||||
COLORREF col;
|
COLORREF col;
|
||||||
HRESULT hr = theme->GetThemeColor
|
HRESULT hr = theme->GetThemeColor
|
||||||
(
|
(
|
||||||
|
Reference in New Issue
Block a user