show the item for which the context menu is shown correctly

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

diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index 35a9fa1fa389fa2c4d029ae23628cfb75f367f2c..63feb0a9d28a9a34a18a71ed7721c5076386e52d 100644 (file)
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -29,22 +29,23 @@ 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 );
     wxPalette();
     wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );

-    ~wxPalette();
+    virtual ~wxPalette();

     bool operator == ( const wxPalette& palette ) const;
     bool operator != ( const wxPalette& palette ) const;
     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;
 
 
     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__
 };
 
 #endif // __WX_PALETTEG_H__