Convert wxFSW_EVENT_{WARNING,ERROR} to string correctly.

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

diff --git a/interface/wx/colourdata.h b/interface/wx/colourdata.h
index 45b5aab17593ac3f3e3ae38349fb033f679e5540..0349e16742a653a411dda1e3cfbf82ceb36b081a 100644 (file)
--- a/interface/wx/colourdata.h
+++ b/interface/wx/colourdata.h
@@ -19,6 +19,12 @@
 class wxColourData : public wxObject
 {
 public:
 class wxColourData : public wxObject
 {
 public:

+    /// number of custom colours we store
+    enum
+    {
+        NUM_CUSTOM = 16
+    };
+

     /**
         Constructor. Initializes the custom colours to @c wxNullColour, the
         @e data colour setting to black, and the @e choose full setting to
     /**
         Constructor. Initializes the custom colours to @c wxNullColour, the
         @e data colour setting to black, and the @e choose full setting to


@@ -33,10 +39,9 @@ public:
 
     /**
         Under Windows, determines whether the Windows colour dialog will
 
     /**
         Under Windows, determines whether the Windows colour dialog will

-        display the full dialog with custom colour selection controls. Under
-        PalmOS, determines whether colour dialog will display full rgb colour
-        picker or only available palette indexer. Has no meaning under other
-        platforms.
+        display the full dialog with custom colour selection controls.
+
+        Has no meaning under other platforms.

 
         The default value is @true.
     */
 
         The default value is @true.
     */


@@ -87,7 +92,7 @@ public:
     void SetCustomColour(int i, const wxColour& colour);
 
     /**
     void SetCustomColour(int i, const wxColour& colour);
 
     /**

-        Converts the colours saved in this class in a string form, separing
+        Converts the colours saved in this class in a string form, separating

         the various colours with a comma.
     */
     wxString ToString() const;
         the various colours with a comma.
     */
     wxString ToString() const;