reSWIGged

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

diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h
index 2054a9a12849b0be14f2c1894a6e034dbfa3d5d9..8babcd8f594517f5bc8fd495f65a50afb8bc42e7 100644 (file)
--- a/include/wx/x11/palette.h
+++ b/include/wx/x11/palette.h
@@ -37,7 +37,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();

-    ~wxPaletteRefData();
+    virtual ~wxPaletteRefData();

 
 protected:
     wxList  m_palettes;
 
 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();
 
     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;
 
     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) ; }

 
     // X-specific
     WXColormap GetXColormap(WXDisplay* display = NULL) const;
 
     // X-specific
     WXColormap GetXColormap(WXDisplay* display = NULL) const;