X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..2724d84bbefd440b4e63997eb45ec9636bcd955d:/include/wx/x11/palette.h?ds=inline diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h index f427ec3e23..eac7614b34 100644 --- a/include/wx/x11/palette.h +++ b/include/wx/x11/palette.h @@ -12,10 +12,9 @@ #ifndef _WX_PALETTE_H_ #define _WX_PALETTE_H_ -#include "wx/gdiobj.h" #include "wx/list.h" -class WXDLLEXPORT wxPalette; +class WXDLLIMPEXP_FWD_CORE wxPalette; // Palette for one display class wxXPalette : public wxObject @@ -32,9 +31,9 @@ public: bool m_destroyable; }; -class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData +class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData { - friend class WXDLLEXPORT wxPalette; + friend class WXDLLIMPEXP_FWD_CORE wxPalette; public: wxPaletteRefData(); virtual ~wxPaletteRefData(); @@ -45,7 +44,7 @@ protected: #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) -class WXDLLEXPORT wxPalette: public wxPaletteBase +class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase { DECLARE_DYNAMIC_CLASS(wxPalette) @@ -58,18 +57,16 @@ public: 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) ; } - - bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; } - bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; } - // X-specific WXColormap GetXColormap(WXDisplay* display = NULL) const; bool TransferBitmap(void *data, int depth, int size); bool TransferBitmap8(unsigned char *data, unsigned long size, void *dest, unsigned int bpp); unsigned long *GetXPixArray(WXDisplay* display, int *pix_array_n); void PutXColormap(WXDisplay* display, WXColormap cmap, bool destroyable); + +protected: + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; }; -#endif -// _WX_PALETTE_H_ +#endif // _WX_PALETTE_H_