X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..961dd75341aaa5083098fefd5c1074d8308b5732:/include/wx/msw/palette.h diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h index 510882fa18..7a0270a6aa 100644 --- a/include/wx/msw/palette.h +++ b/include/wx/msw/palette.h @@ -12,7 +12,7 @@ #ifndef _WX_PALETTE_H_ #define _WX_PALETTE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "palette.h" #endif @@ -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);