Patch from Bo for recent API changes

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

diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index 2eb853fc11f9ca16d586e9e0dfbbf7aba16ef310..a8ecde718531fbfd922181baa202a48d07ad83d9 100644 (file)
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -21,7 +21,7 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;
 
 //-----------------------------------------------------------------------------
 // wxPalette
@@ -33,15 +33,14 @@ 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;
 
-    virtual int GetColoursCount() const:
+    virtual int GetColoursCount() const;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPalette)