update to 2.9.0

[wxWidgets.git] / include / wx / motif / palette.h

diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h
index a1fa11be7eac093d1704e83477041b568851bfc3..644e066af9f25b224f579f2e1a4aa663a6110413 100644 (file)
--- 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;
@@ -53,15 +53,13 @@ public:
     wxPalette();
 
     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) ; }
-
-    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;