fixed typo in XRC error message

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

diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index bc604731437693b6a4cfdbc8653458883f4e1fc3..760e6039f586b5114f5403a5f61ee44491e90662 100644 (file)
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

-// Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -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
+int wxPalette::GetColoursCount() 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);
+    if (m_refData)
+        return M_PALETTEDATA->m_count;
+    
+    return 0;    

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


@@ -120,11 +108,11 @@ bool wxPalette::Create(int n,
     return true;
 }
 
     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
 
     int closest = 0;
     double d,distance = 1000.0; // max. dist is 256


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

-#endif // wxUSE_PALETTE
+wxGDIRefData *wxPalette::CreateGDIRefData() const
+{
+    return new wxPaletteRefData;
+}

 
 

+wxGDIRefData *wxPalette::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxPaletteRefData(*wx_static_cast(const wxPaletteRefData *, data));
+}

 
 

+#endif // wxUSE_PALETTE