X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/motif/palette.h?ds=sidebyside diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h index c34767f8ce..644e066af9 100644 --- a/include/wx/motif/palette.h +++ b/include/wx/motif/palette.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: palette.h +// Name: wx/motif/palette.h // Purpose: wxPalette class // Author: Julian Smart // Modified by: @@ -12,23 +12,19 @@ #ifndef _WX_PALETTE_H_ #define _WX_PALETTE_H_ -#ifdef __GNUG__ -#pragma interface "palette.h" -#endif - #include "wx/gdiobj.h" #include "wx/list.h" -class WXDLLEXPORT wxPalette; +class WXDLLIMPEXP_FWD_CORE wxPalette; // Palette for one display class wxXPalette : public wxObject { DECLARE_DYNAMIC_CLASS(wxXPalette) - + public: wxXPalette(); - + WXDisplay* m_display; int m_pix_array_n; unsigned long* m_pix_array; @@ -38,37 +34,33 @@ public: class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData { - friend class WXDLLEXPORT wxPalette; + friend class WXDLLIMPEXP_FWD_CORE wxPalette; public: wxPaletteRefData(); - ~wxPaletteRefData(); - + virtual ~wxPaletteRefData(); + protected: wxList m_palettes; }; #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) -class WXDLLEXPORT wxPalette: public wxGDIObject +class WXDLLEXPORT wxPalette: public wxPaletteBase { DECLARE_DYNAMIC_CLASS(wxPalette) - + public: wxPalette(); - wxPalette(const wxPalette& palette) { Ref(palette); } - + wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); - ~wxPalette(); + virtual ~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; } - + + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return (m_refData != NULL) ; } + // Motif-specific WXColormap GetXColormap(WXDisplay* display = NULL) const; bool TransferBitmap(void *data, int depth, int size);