X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ef3a57a47f840adea9d38bc11cb30689a0838a..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/motif/palette.h diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h index 2ba91c323a..644e066af9 100644 --- a/include/wx/motif/palette.h +++ b/include/wx/motif/palette.h @@ -15,7 +15,7 @@ #include "wx/gdiobj.h" #include "wx/list.h" -class WXDLLEXPORT wxPalette; +class WXDLLIMPEXP_FWD_CORE wxPalette; // Palette for one display class wxXPalette : public wxObject @@ -34,10 +34,10 @@ 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; @@ -51,19 +51,15 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase 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(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;