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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index e946446c55d2041a70b911c56f7ab8d7985bdaee..52bdd1eeb25b33e94beb2b3659df289026b60fb6 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -428,7 +428,7 @@ public:
                                int themePart,
                                int themeState,
                                MSWThemeColour themeColour,
                                int themePart,
                                int themeState,
                                MSWThemeColour themeColour,

-                               wxSystemColour fallback);
+                               wxSystemColour fallback) const;

 
     // gives the parent the possibility to draw its children background, e.g.
     // this is used by wxNotebook to do it using DrawThemeBackground()
 
     // gives the parent the possibility to draw its children background, e.g.
     // this is used by wxNotebook to do it using DrawThemeBackground()

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 67d6be5c1624fbad04da33116f0e8ddbbe1ffb8d..81b6b93e5b059978f1fd4976a171b6cb1dbeb87b 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -4739,7 +4739,7 @@ wxColour wxWindowMSW::MSWGetThemeColour(const wchar_t *themeName,
                                         int themePart,
                                         int themeState,
                                         MSWThemeColour themeColour,
                                         int themePart,
                                         int themeState,
                                         MSWThemeColour themeColour,

-                                        wxSystemColour fallback)
+                                        wxSystemColour fallback) const

 {
 #if wxUSE_UXTHEME
     const wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
 {
 #if wxUSE_UXTHEME
     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;
         HRESULT hr = theme->GetThemeColor
                             (
         COLORREF col;
         HRESULT hr = theme->GetThemeColor
                             (