Default to wxConvUTF8 (not wxConvAuto) in wxDataInputStream and wxDataOutputStream...

[wxWidgets.git] / interface / wx / palette.h

diff --git a/interface/wx/palette.h b/interface/wx/palette.h
index f1a9a4bdc09bb585db2e3411180636ff0767f3c1..0a4f35678bf0ead66b1ab9b5b44593c3d171dcae 100644 (file)
--- a/interface/wx/palette.h
+++ b/interface/wx/palette.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxPalette
-    @wxheader{palette.h}
 
     A palette is a table that maps pixel values to RGB colours. It allows the
     colours of a low-depth bitmap, for example, to be mapped to the available
@@ -42,6 +41,9 @@ public:
 
     /**
         Copy constructor, uses @ref overview_refcount.
+
+        @param palette
+            A reference to the palette to copy.
     */
     wxPalette(const wxPalette& palette);
 
@@ -49,8 +51,6 @@ public:
         Creates a palette from arrays of size @a n, one for each red, blue or
         green component.
 
-        @param palette
-            A pointer or reference to the palette to copy.
         @param n
             The number of indices in the palette.
         @param red
@@ -71,7 +71,7 @@ public:
 
         @see @ref overview_refcount_destruct "reference-counted object destruction"
     */
-    ~wxPalette();
+    virtual ~wxPalette();
 
     /**
         Creates a palette from arrays of size @a n, one for each red, blue or
@@ -97,7 +97,7 @@ public:
     /**
         Returns number of entries in palette.
     */
-    int GetColoursCount() const;
+    virtual int GetColoursCount() const;
 
     /**
         Returns a pixel value (index into the palette) for the given RGB values.
@@ -132,14 +132,13 @@ public:
 
         @see GetPixel()
     */
-    bool GetRGB(int pixel, const unsigned char* red,
-                const unsigned char* green,
-                const unsigned char* blue) const;
+    bool GetRGB(int pixel, unsigned char* red, unsigned char* green,
+                unsigned char* blue) const;
 
     /**
         Returns @true if palette data is present.
     */
-    bool IsOk() const;
+    virtual bool IsOk() const;
 
     /**
         Assignment operator, using @ref overview_refcount.