make wxVarVScrollLegacyAdaptor::OnGetLineHeight() non-pure virtual to fix compilation...

[wxWidgets.git] / include / wx / mgl / palette.h

diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h
index 00c12217d6aff07a7c7b4cf6edd966098dd2acbe..c8d46785cd6f23acaaf948a86f552eff44e58f24 100644 (file)
--- a/include/wx/mgl/palette.h
+++ b/include/wx/mgl/palette.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palette.h
+// Name:        wx/mgl/palette.h

 // Purpose:
 // Author:      Vaclav Slavik
 // Created:     2001/03/11
 // Purpose:
 // Author:      Vaclav Slavik
 // Created:     2001/03/11


@@ -34,15 +34,12 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase
 public:
     wxPalette();
     wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
 public:
     wxPalette();
     wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);

-    wxPalette(const wxPalette& palette);
-    ~wxPalette();
-    wxPalette& operator = (const wxPalette& palette);
-    bool operator == (const wxPalette& palette) const;
-    bool operator != (const wxPalette& palette) const;
-    virtual bool Ok() const;
+    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);
 
     bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);

-    int GetPixel(const unsigned char red, const unsigned char green, const 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;
 
     // implementation
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
     // implementation