make wxSetEnv compatible with ANSI and Unicode, deprecate passing NULL to it in favou...

[wxWidgets.git] / include / wx / generic / paletteg.h

diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index f059c0c4f55c9300418dfa460c5eec54c2edfe98..6ae9287a914c316a0cb386d52338ce4641098e87 100644 (file)
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -29,22 +29,21 @@ class WXDLLIMPEXP_CORE wxPalette;
 
 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();
-    bool operator == ( const wxPalette& palette ) const;
-    bool operator != ( const wxPalette& palette ) const;
-    virtual bool Ok() const;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;
 
     bool Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     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__