X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/917be7ed065337e8a7a67615969ecaade9eea809..89360a8c873add3f68e05191d9311cc10a49442d:/include/wx/palmos/palette.h diff --git a/include/wx/palmos/palette.h b/include/wx/palmos/palette.h index cebc6a2bc5..690299c08c 100644 --- a/include/wx/palmos/palette.h +++ b/include/wx/palmos/palette.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: palette.h +// Name: wx/palmos/palette.h // Purpose: wxPalette class -// Author: William Osborne +// Author: William Osborne - minimal working wxPalmOS port // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -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" class WXDLLEXPORT wxPalette; @@ -25,7 +21,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData friend class WXDLLEXPORT wxPalette; public: wxPaletteRefData(void); - ~wxPaletteRefData(void); + virtual ~wxPaletteRefData(void); protected: WXHPALETTE m_hPalette; }; @@ -38,19 +34,15 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase public: wxPalette(void); - inline wxPalette(const wxPalette& palette) { Ref(palette); } wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - ~wxPalette(void); + virtual ~wxPalette(void); 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(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) const { return m_refData == palette.m_refData; } - inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; } + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk(void) const { return (m_refData != NULL) ; } virtual bool FreeResource(bool force = false);