removed wx/wave.h which was deprecated since 2.4

[wxWidgets.git] / include / wx / mac / classic / palette.h

diff --git a/include/wx/mac/classic/palette.h b/include/wx/mac/classic/palette.h
index e800fd42323703f17dbc94ce7f0df6a8d97f154e..cfb756999426cf5416f5a2e97c911e523de351d8 100644 (file)
--- a/include/wx/mac/classic/palette.h
+++ b/include/wx/mac/classic/palette.h
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();

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

 protected:
     wxColour* m_palette;
     wxInt32   m_count ;
 protected:
     wxColour* m_palette;
     wxInt32   m_count ;


@@ -40,12 +40,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) ; }
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const { return (m_refData != NULL) ; }

 
   inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
   inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
 
   inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
   inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }