Implememt GetColoursCount() in the generic wxPalette.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index f059c0c4f55c9300418dfa460c5eec54c2edfe98..2eb853fc11f9ca16d586e9e0dfbbf7aba16ef310 100644 (file)
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -29,10 +29,7 @@ class WXDLLIMPEXP_CORE wxPalette;
 
 class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
 {
 
 class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
 {

-  DECLARE_DYNAMIC_CLASS(wxPalette)
-
-  public:
-
+public:

     wxPalette();
     wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
     virtual ~wxPalette();
     wxPalette();
     wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
     virtual ~wxPalette();


@@ -44,7 +41,10 @@ class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
     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;
 
     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;
 

-    // no data
+    virtual int GetColoursCount() const:
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPalette)

 };
 
 #endif // __WX_PALETTEG_H__
 };
 
 #endif // __WX_PALETTEG_H__

diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index 741a78893abc1b74e5434828d4e672987fe96753..87945ca2743d9ebfbdd515189648df8c3312bd35 100644 (file)
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -80,11 +80,19 @@ bool wxPalette::operator != (const wxPalette& palette) const
     return m_refData != palette.m_refData;
 }
 
     return m_refData != palette.m_refData;
 }
 

-bool wxPalette::Ok(void) const
+bool wxPalette::Ok() const

 {
     return (m_refData != NULL);
 }
 
 {
     return (m_refData != NULL);
 }
 

+int wxPalette::GetColoursCount() const
+{
+    if (m_refData)
+        return M_PALETTEDATA->m_count;
+    
+    return 0;    
+}
+

 bool wxPalette::Create(int n,
                        const unsigned char *red,
                        const unsigned char *green,
 bool wxPalette::Create(int n,
                        const unsigned char *red,
                        const unsigned char *green,