X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/917be7ed065337e8a7a67615969ecaade9eea809..bcd96979730f8bb56ac220f9092439694d4e0456:/include/wx/x11/palette.h diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h index aaef465ffd..2054a9a128 100644 --- a/include/wx/x11/palette.h +++ b/include/wx/x11/palette.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: palette.h +// Name: wx/x11/palette.h // Purpose: wxPalette class // Author: Julian Smart // Modified by: @@ -12,10 +12,6 @@ #ifndef _WX_PALETTE_H_ #define _WX_PALETTE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "palette.h" -#endif - #include "wx/gdiobj.h" #include "wx/list.h" @@ -55,17 +51,15 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase public: wxPalette(); - wxPalette(const wxPalette& palette) { Ref(palette); } wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); ~wxPalette(); bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - int GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const; + int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const; virtual bool Ok() const { return (m_refData != NULL) ; } - wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; } bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; } bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }