Applied patch #15286: documentation and col/rowspan demo by dghart

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

diff --git a/interface/wx/palette.h b/interface/wx/palette.h
index fd7406c8d6dfb34567579e910ef194b9bc6f30b3..8dde732ed70ec444bab9ffaed7fb2f1c5a1a2984 100644 (file)
--- a/interface/wx/palette.h
+++ b/interface/wx/palette.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxPalette
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxPalette
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -60,6 +60,11 @@ public:
         @param blue
             An array of blue values.
 
         @param blue
             An array of blue values.
 

+        @beginWxPerlOnly
+        In wxPerl this method takes as parameters
+        3 array references (they must be of the same length).
+        @endWxPerlOnly
+

         @see Create()
     */
     wxPalette(int n, const unsigned char* red,
         @see Create()
     */
     wxPalette(int n, const unsigned char* red,


@@ -130,16 +135,20 @@ public:
 
         @return @true if the operation was successful.
 
 
         @return @true if the operation was successful.
 

+        @beginWxPerlOnly
+        In wxPerl this method takes only the @a pixel parameter and
+        returns a 3-element list (or the empty list upon failure).
+        @endWxPerlOnly
+

         @see GetPixel()
     */
         @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.
     */
 
     /**
         Returns @true if palette data is present.
     */

-    bool IsOk() const;
+    virtual bool IsOk() const;

 
     /**
         Assignment operator, using @ref overview_refcount.
 
     /**
         Assignment operator, using @ref overview_refcount.