X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..e2effeb9884f5bfbc5d42e1f2b01bd48b4f5f8c6:/include/wx/palmos/palette.h?ds=sidebyside diff --git a/include/wx/palmos/palette.h b/include/wx/palmos/palette.h index b0753763e2..0fff3043ea 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 ///////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ protected: #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) -class WXDLLEXPORT wxPalette: public wxGDIObject +class WXDLLEXPORT wxPalette: public wxPaletteBase { DECLARE_DYNAMIC_CLASS(wxPalette) @@ -52,14 +52,11 @@ public: 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); + virtual bool FreeResource(bool force = false); inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); } void SetHPALETTE(WXHPALETTE pal); }; -#define wxColorMap wxPalette -#define wxColourMap wxPalette - #endif // _WX_PALETTE_H_