add wxShowEvent::IsShown() and wxIconizeEvent::IsIconized() instead of (now deprecate...

[wxWidgets.git] / interface / colour.h

diff --git a/interface/colour.h b/interface/colour.h
index 86b430e66fc705e5c0884f75875e45ac97dc45cc..52bc2f28d1c2e83cec0747ed0299a006d24d5201 100644 (file)
--- a/interface/colour.h
+++ b/interface/colour.h
@@ -23,8 +23,14 @@
     @category{gdi}
 
     @stdobjects
-    ::wxNullColour, ::wxBLACK, ::wxWHITE, ::wxRED, ::wxBLUE, ::wxGREEN,
-    ::wxCYAN, ::wxLIGHT_GREY
+    - ::wxNullColour - An empty, invalid colour.
+    - ::wxBLACK
+    - ::wxBLUE
+    - ::wxCYAN
+    - ::wxGREEN
+    - ::wxLIGHT_GREY
+    - ::wxRED
+    - ::wxWHITE
 
     @see wxColourDatabase, wxPen, wxBrush, wxColourDialog, wxSystemSettings
 */
@@ -88,7 +94,7 @@ public:
         wxC2S_CSS_SYNTAX (which is the only one supporting alpha) is not
         specified in flags.
 
-        @wxsince{2.7.0}
+        @since 2.7.0
     */
     wxString GetAsString(long flags);
 
@@ -130,7 +136,7 @@ public:
 
         Returns @true if the conversion was successful, @false otherwise.
 
-        @wxsince{2.7.0}
+        @since 2.7.0
     */
     void Set(unsigned char red, unsigned char green,
              unsigned char blue,
@@ -163,45 +169,17 @@ public:
 };
 
 
-/**
-    An empty colour.
-*/
+/** @name Predefined colors. */
+//@{
 wxColour wxNullColour;
-
-/**
-    FIXME
-*/
-wxColour wxBLACK;
-
-/**
-    FIXME
-*/
-wxColour wxWHITE;
-
-/**
-    FIXME
-*/
-wxColour wxRED;
-
-/**
-    FIXME
-*/
-wxColour wxBLUE;
-
-/**
-    FIXME
-*/
-wxColour wxGREEN;
-
-/**
-    FIXME
-*/
-wxColour wxCYAN;
-
-/**
-    FIXME
-*/
-wxColour wxLIGHT_GREY;
+wxColour* wxBLACK;
+wxColour* wxBLUE;
+wxColour* wxCYAN;
+wxColour* wxGREEN;
+wxColour* wxLIGHT_GREY;
+wxColour* wxRED;
+wxColour* wxWHITE;
+//@}