fixing warning and compile error against 10.4

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

diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index 6ae9287a914c316a0cb386d52338ce4641098e87..4d3ccc308dcef607cb3e5b7896101bafb8d4541f 100644 (file)
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -21,7 +21,7 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;

 
 //-----------------------------------------------------------------------------
 // wxPalette
 
 //-----------------------------------------------------------------------------
 // wxPalette


@@ -33,8 +33,6 @@ 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();

-    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 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;


@@ -42,6 +40,10 @@ public:
 
     virtual int GetColoursCount() const;
 
 
     virtual int GetColoursCount() const;
 

+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxPalette)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxPalette)
 };