reset the tooltip text before changing it, this apparently prevents a spurious redraw...

[wxWidgets.git] / src / generic / paletteg.cpp

diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index 24900fc538548721c72e8a08ed153ee9fd6a67a6..5b89e26230204dac5565cb4acc93ed37e2cb5bd9 100644 (file)
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -28,12 +28,12 @@ struct wxPaletteEntry
     unsigned char red, green, blue;
 };
 
     unsigned char red, green, blue;
 };
 

-class wxPaletteRefData: public wxObjectRefData
+class wxPaletteRefData : public wxGDIRefData

 {
 {

-  public:
-
-    wxPaletteRefData(void);
-    ~wxPaletteRefData(void);
+public:
+    wxPaletteRefData();
+    wxPaletteRefData(const wxPaletteRefData& palette);
+    virtual ~wxPaletteRefData();

 
     int m_count;
     wxPaletteEntry *m_entries;
 
     int m_count;
     wxPaletteEntry *m_entries;


@@ -45,6 +45,14 @@ wxPaletteRefData::wxPaletteRefData()
     m_entries = NULL;
 }
 
     m_entries = NULL;
 }
 

+wxPaletteRefData::wxPaletteRefData(const wxPaletteRefData& palette)
+{
+    m_count = palette.m_count;
+    m_entries = new wxPaletteEntry[m_count];
+    for ( int i = 0; i < m_count; i++ )
+        m_entries[i] = palette.m_entries[i];
+}
+

 wxPaletteRefData::~wxPaletteRefData()
 {
     delete[] m_entries;
 wxPaletteRefData::~wxPaletteRefData()
 {
     delete[] m_entries;


@@ -66,36 +74,16 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
     Create(n, red, green, blue);
 }
 
     Create(n, red, green, blue);
 }
 

-wxPalette::wxPalette(const wxPalette& palette)
-    : wxPaletteBase()
-{
-    Ref(palette);
-}
-

 wxPalette::~wxPalette()
 {
 }
 
 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
+int wxPalette::GetColoursCount() const

 {
 {

-    return (m_refData != NULL);
+    if (m_refData)
+        return M_PALETTEDATA->m_count;
+    
+    return 0;    

 }
 
 bool wxPalette::Create(int n,
 }
 
 bool wxPalette::Create(int n,


@@ -157,4 +145,14 @@ bool wxPalette::GetRGB(int pixel,
     return true;
 }
 
     return true;
 }
 

+wxGDIRefData *wxPalette::CreateGDIRefData() const
+{
+    return new wxPaletteRefData;
+}
+
+wxGDIRefData *wxPalette::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxPaletteRefData(*static_cast<const wxPaletteRefData *>(data));
+}
+

 #endif // wxUSE_PALETTE
 #endif // wxUSE_PALETTE