X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..72ee73c1968745451f136f3d88d954aee86c4b38:/src/generic/paletteg.cpp

diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index bc60473143..ac8cd8a83b 100644
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,7 +33,7 @@ class wxPaletteRefData: public wxObjectRefData
   public:
 
     wxPaletteRefData(void);
-    ~wxPaletteRefData(void);
+    virtual ~wxPaletteRefData(void);
 
     int m_count;
     wxPaletteEntry *m_entries;
@@ -66,36 +66,21 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
     Create(n, red, green, blue);
 }
 
-wxPalette::wxPalette(const wxPalette& palette)
-    : wxPaletteBase()
-{
-    Ref(palette);
-}
-
 wxPalette::~wxPalette()
 {
 }
 
-wxPalette& wxPalette::operator = (const wxPalette& palette)
-{
-    if (*this == palette) return (*this);
-    Ref(palette);
-    return *this;
-}
-
-bool wxPalette::operator == (const wxPalette& palette) const
-{
-    return m_refData == palette.m_refData;
-}
-
-bool wxPalette::operator != (const wxPalette& palette) const
+bool wxPalette::IsOk() const
 {
-    return m_refData != palette.m_refData;
+    return (m_refData != NULL);
 }
 
-bool wxPalette::Ok(void) const
+int wxPalette::GetColoursCount() const
 {
-    return (m_refData != NULL);
+    if (m_refData)
+        return M_PALETTEDATA->m_count;
+    
+    return 0;    
 }
 
 bool wxPalette::Create(int n,
@@ -120,11 +105,11 @@ bool wxPalette::Create(int n,
     return true;
 }
 
-int wxPalette::GetPixel( const unsigned char red,
-                         const unsigned char green,
-                         const unsigned char blue ) const
+int wxPalette::GetPixel( unsigned char red,
+                         unsigned char green,
+                         unsigned char blue ) const
 {
-    if (!m_refData) return false;
+    if (!m_refData) return wxNOT_FOUND;
 
     int closest = 0;
     double d,distance = 1000.0; // max. dist is 256
@@ -158,5 +143,3 @@ bool wxPalette::GetRGB(int pixel,
 }
 
 #endif // wxUSE_PALETTE
-
-