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 04368cb846e2e320fbf306b37f8113ee313fee9a..cfb756999426cf5416f5a2e97c911e523de351d8 100644 (file)
--- a/include/wx/mac/classic/palette.h
+++ b/include/wx/mac/classic/palette.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        palette.h
+// Name:        wx/mac/classic/palette.h
 // Purpose:     wxPalette class
 // Author:      Stefan Csomor
 // Modified by:
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
-    ~wxPaletteRefData();
+    virtual ~wxPaletteRefData();
 protected:
     wxColour* m_palette;
     wxInt32   m_count ;
@@ -38,19 +38,16 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase
 
 public:
   wxPalette();
-  wxPalette(const wxPalette& palette)
-      : wxPaletteBase()
-  { 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(const unsigned char red, const unsigned char green, const unsigned char blue) const;
+  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 wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
   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; }