X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..159b66c02a8f1c724d1af3c768ad5d90f4c8a0e2:/include/wx/msw/palette.h diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h index f7dffc57b0..3eaa3ac4ef 100644 --- a/include/wx/msw/palette.h +++ b/include/wx/msw/palette.h @@ -5,12 +5,12 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __PALETTEH__ -#define __PALETTEH__ +#ifndef _WX_PALETTE_H_ +#define _WX_PALETTE_H_ #ifdef __GNUG__ #pragma interface "palette.h" @@ -39,7 +39,6 @@ class WXDLLEXPORT wxPalette: public wxGDIObject public: wxPalette(void); inline wxPalette(const wxPalette& palette) { Ref(palette); } - inline wxPalette(const wxPalette* palette) { /* UnRef(); */ if (palette) Ref(*palette); } wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); ~wxPalette(void); @@ -50,8 +49,8 @@ public: virtual bool Ok(void) const { return (m_refData != NULL) ; } inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; } - inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; } - inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; } + inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; } + inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; } virtual bool FreeResource(bool force = FALSE); @@ -63,4 +62,4 @@ public: #define wxColourMap wxPalette #endif - // __PALETTEH__ + // _WX_PALETTE_H_