X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/650291520681b5b5e3c2509838dd9f1f0392c84c..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/os2/palette.h diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h index 78d794277b..3f094805f2 100644 --- a/include/wx/os2/palette.h +++ b/include/wx/os2/palette.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: palette.h +// Name: wx/os2/palette.h // Purpose: wxPalette class // Author: David Webster // Modified by: @@ -13,15 +13,16 @@ #define _WX_PALETTE_H_ #include "wx/gdiobj.h" +#include "wx/os2/private.h" -class WXDLLEXPORT wxPalette; +class WXDLLIMPEXP_FWD_CORE wxPalette; class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData { - friend class WXDLLEXPORT wxPalette; + friend class WXDLLIMPEXP_FWD_CORE wxPalette; public: wxPaletteRefData(); - ~wxPaletteRefData(); + virtual ~wxPaletteRefData(); // protected: WXHPALETTE m_hPalette; HPS m_hPS; @@ -29,29 +30,28 @@ public: #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) -class WXDLLEXPORT wxPalette: public wxGDIObject +class WXDLLEXPORT wxPalette: public wxPaletteBase { DECLARE_DYNAMIC_CLASS(wxPalette) public: wxPalette(); - inline wxPalette(const wxPalette& rPalette) { Ref(rPalette); } wxPalette( int n ,const unsigned char* pRed ,const unsigned char* pGreen ,const unsigned char* pBlue ); - ~wxPalette(); + virtual ~wxPalette(); bool Create( int n ,const unsigned char* pRed ,const unsigned char* pGreen ,const unsigned char* pBlue ); - int GetPixel( const unsigned char cRed - ,const unsigned char cGreen - ,const unsigned char cBlue + int GetPixel( unsigned char cRed + ,unsigned char cGreen + ,unsigned char cBlue ) const; bool GetRGB( int nPixel ,unsigned char* pRed @@ -59,22 +59,15 @@ public: ,unsigned char* pBlue ) const; - virtual bool Ok(void) const { return (m_refData != NULL) ; } + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk(void) const { return (m_refData != NULL) ; } - inline wxPalette& operator = (const wxPalette& rPalette) { if (*this == rPalette) return (*this); Ref(rPalette); return *this; } - inline bool operator == (const wxPalette& rPalette) { return m_refData == rPalette.m_refData; } - inline bool operator != (const wxPalette& rPalette) { return m_refData != rPalette.m_refData; } - - virtual bool FreeResource(bool bForce = FALSE); + virtual bool FreeResource(bool bForce = false); inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); } void SetHPALETTE(WXHPALETTE hPalette); void SetPS(HPS hPS); }; // end of CLASS wxPalette -#define wxColorMap wxPalette -#define wxColourMap wxPalette - #endif // _WX_PALETTE_H_ -