Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / mgl / palette.cpp

diff --git a/src/mgl/palette.cpp b/src/mgl/palette.cpp
index a21e74e10434475dcaf44711e95b96efa66ce999..fcac1e22ea427442cae607979f7f4acd94e78723 100644 (file)
--- a/src/mgl/palette.cpp
+++ b/src/mgl/palette.cpp
@@ -26,7 +26,7 @@ class wxPaletteRefData: public wxObjectRefData
 {
     public:
         wxPaletteRefData(void);
-        ~wxPaletteRefData(void);
+        virtual ~wxPaletteRefData(void);
 
         int m_count;
         palette_t *m_entries;
@@ -59,37 +59,10 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
     Create(n, red, green, blue);
 }
 
-wxPalette::wxPalette(const wxPalette& palette)
-{
-    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
-{
-    return m_refData != palette.m_refData;
-}
-
-bool wxPalette::Ok(void) const
-{
-    return (m_refData != NULL);
-}
-
 bool wxPalette::Create(int n,
                        const unsigned char *red,
                        const unsigned char *green,
@@ -153,12 +126,12 @@ bool wxPalette::GetRGB(int pixel,
 
 int wxPalette::GetColoursCount() const
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid palette") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid palette") );
     return M_PALETTEDATA->m_count;
 }
 
 palette_t *wxPalette::GetMGLpalette_t() const
 {
-    wxCHECK_MSG( Ok(), NULL, wxT("invalid palette") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid palette") );
     return M_PALETTEDATA->m_entries;
 }