X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..c8e1af672f46e93ae2fe6d7f9d5b35a3d8d49c16:/include/wx/motif/palette.h diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h index bff484a85e..64403fb7ad 100644 --- a/include/wx/motif/palette.h +++ b/include/wx/motif/palette.h @@ -25,10 +25,10 @@ class WXDLLEXPORT wxPalette; class wxXPalette : public wxObject { DECLARE_DYNAMIC_CLASS(wxXPalette) - + public: wxXPalette(); - + WXDisplay* m_display; int m_pix_array_n; unsigned long* m_pix_array; @@ -42,33 +42,33 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData public: wxPaletteRefData(); ~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(); 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; 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; } - + // Motif-specific WXColormap GetXColormap(WXDisplay* display = NULL) const; bool TransferBitmap(void *data, int depth, int size);