From 913ce2990e22172fd68ab06b0c380cc70d88fc52 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Dec 2011 23:52:47 +0000 Subject: [PATCH] Make wxPalette ctor and Create() const-correct in wxMSW. The input data is never modified so should be const (it is also documented as being const and actually is const in the other ports). Closes #13776. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/palette.h | 4 ++-- src/msw/palette.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h index 9d28bbfc3a..7d0cacec6a 100644 --- a/include/wx/msw/palette.h +++ b/include/wx/msw/palette.h @@ -19,13 +19,13 @@ class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase public: wxPalette() { } wxPalette(int n, - unsigned char *red, unsigned char *green, unsigned char *blue) + const unsigned char *red, const unsigned char *green, const unsigned char *blue) { Create(n, red, green, blue); } bool Create(int n, - unsigned char *red, unsigned char *green, unsigned char *blue); + const unsigned char *red, const unsigned char *green, const unsigned char *blue); virtual int GetColoursCount() const; diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp index a9c9fc8056..2547d98851 100644 --- a/src/msw/palette.cpp +++ b/src/msw/palette.cpp @@ -32,9 +32,9 @@ public: wxPaletteRefData() { Init(); } wxPaletteRefData(int n, - unsigned char *red, - unsigned char *green, - unsigned char *blue) + const unsigned char *red, + const unsigned char *green, + const unsigned char *blue) { Init(); @@ -117,9 +117,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) bool wxPalette::Create(int n, - unsigned char *red, - unsigned char *green, - unsigned char *blue) + const unsigned char *red, + const unsigned char *green, + const unsigned char *blue) { m_refData = new wxPaletteRefData(n, red, green, blue); -- 2.47.2