don't place NULL pointers in the GDK window array in GTKGetWindow()

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

diff --git a/interface/wx/brush.h b/interface/wx/brush.h
index 512b7f00ebaf07eb2c3c6ff0f0dbe397f7259947..7af8e2f53384515a0a5ece4ee5b9959dde5eba31 100644 (file)
--- a/interface/wx/brush.h
+++ b/interface/wx/brush.h
@@ -20,10 +20,12 @@ enum wxBrushStyle
         /**< Transparent (no fill). */
 
     wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE,
         /**< Transparent (no fill). */
 
     wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE,

-        /**< @todo WHAT's THIS?? */
+        /**< Uses a bitmap as a stipple; the mask is used for blitting monochrome
+             using text foreground and background colors. */

 
     wxBRUSHSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,
 
     wxBRUSHSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,

-        /**< @todo WHAT's THIS?? */
+        /**< Uses a bitmap as a stipple; mask is used for masking areas in the
+             stipple bitmap. */

 
     wxBRUSHSTYLE_STIPPLE = wxSTIPPLE,
         /**< Uses a bitmap as a stipple. */
 
     wxBRUSHSTYLE_STIPPLE = wxSTIPPLE,
         /**< Uses a bitmap as a stipple. */


@@ -82,9 +84,17 @@ enum wxBrushStyle
     @category{gdi}
 
     @stdobjects
     @category{gdi}
 
     @stdobjects

-    ::wxNullBrush, ::wxBLUE_BRUSH, ::wxGREEN_BRUSH, ::wxWHITE_BRUSH,
-    ::wxBLACK_BRUSH, ::wxGREY_BRUSH, ::wxMEDIUM_GREY_BRUSH, ::wxLIGHT_GREY_BRUSH,
-    ::wxTRANSPARENT_BRUSH, ::wxCYAN_BRUSH, ::wxRED_BRUSH
+    @li ::wxNullBrush
+    @li ::wxBLACK_BRUSH
+    @li ::wxBLUE_BRUSH
+    @li ::wxCYAN_BRUSH
+    @li ::wxGREEN_BRUSH
+    @li ::wxGREY_BRUSH
+    @li ::wxLIGHT_GREY_BRUSH
+    @li ::wxMEDIUM_GREY_BRUSH
+    @li ::wxRED_BRUSH
+    @li ::wxTRANSPARENT_BRUSH
+    @li ::wxWHITE_BRUSH

 
     @see wxBrushList, wxDC, wxDC::SetBrush
 */
 
     @see wxBrushList, wxDC, wxDC::SetBrush
 */


@@ -109,7 +119,7 @@ public:
 
     /**
         Constructs a stippled brush using a bitmap.
 
     /**
         Constructs a stippled brush using a bitmap.

-        The brush style will be set to wxBRUSHSTYLE_STIPPLE.
+        The brush style will be set to @c wxBRUSHSTYLE_STIPPLE.

     */
     wxBrush(const wxBitmap& stippleBitmap);
 
     */
     wxBrush(const wxBitmap& stippleBitmap);
 


@@ -139,7 +149,7 @@ public:
     virtual wxColour GetColour() const;
 
     /**
     virtual wxColour GetColour() const;
 
     /**

-        Gets a pointer to the stipple bitmap. If the brush does not have a wxBRUSHSTYLE_STIPPLE
+        Gets a pointer to the stipple bitmap. If the brush does not have a @c wxBRUSHSTYLE_STIPPLE

         style, this bitmap may be non-@NULL but uninitialised (i.e. wxBitmap:IsOk() returns @false).
 
         @see SetStipple()
         style, this bitmap may be non-@NULL but uninitialised (i.e. wxBitmap:IsOk() returns @false).
 
         @see SetStipple()


@@ -165,7 +175,7 @@ public:
         constructor has been used (for example, the brush is a member of a class, or
         @NULL has been assigned to it).
     */
         constructor has been used (for example, the brush is a member of a class, or
         @NULL has been assigned to it).
     */

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

 
     //@{
     /**
 
     //@{
     /**


@@ -173,7 +183,7 @@ public:
 
         @see GetColour()
     */
 
         @see GetColour()
     */

-    virtual void SetColour(wxColour& colour);
+    virtual void SetColour(const wxColour& colour);

     virtual void SetColour(unsigned char red, unsigned char green, unsigned char blue);
     //@}
 
     virtual void SetColour(unsigned char red, unsigned char green, unsigned char blue);
     //@}
 


@@ -183,9 +193,9 @@ public:
         @param bitmap
             The bitmap to use for stippling.
 
         @param bitmap
             The bitmap to use for stippling.
 

-        @remarks The style will be set to wxBRUSHSTYLE_STIPPLE, unless the bitmap
+        @remarks The style will be set to @c wxBRUSHSTYLE_STIPPLE, unless the bitmap

                  has a mask associated to it, in which case the style will be set
                  has a mask associated to it, in which case the style will be set

-                 to wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE.
+                 to @c wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE.

 
         @see wxBitmap
     */
 
         @see wxBitmap
     */


@@ -216,56 +226,77 @@ public:
 
 /**
     An empty brush.
 
 /**
     An empty brush.

+    wxBrush::IsOk() always returns @false for this object.

 */
 wxBrush wxNullBrush;
 
 /**
     Blue brush.
 */
 wxBrush wxNullBrush;
 
 /**
     Blue brush.

+    Except for the color it has all standard attributes
+    (@c wxBRUSHSTYLE_SOLID, no stipple bitmap, etc...).

 */
 wxBrush* wxBLUE_BRUSH;
 
 /**
     Green brush.
 */
 wxBrush* wxBLUE_BRUSH;
 
 /**
     Green brush.

+    Except for the color it has all standard attributes
+    (@c wxBRUSHSTYLE_SOLID, no stipple bitmap, etc...).

 */
 wxBrush* wxGREEN_BRUSH;
 
 /**
     White brush.
 */
 wxBrush* wxGREEN_BRUSH;
 
 /**
     White brush.

+    Except for the color it has all standard attributes
+    (@c wxBRUSHSTYLE_SOLID, no stipple bitmap, etc...).

 */
 wxBrush* wxWHITE_BRUSH;
 
 /**
     Black brush.
 */
 wxBrush* wxWHITE_BRUSH;
 
 /**
     Black brush.

+    Except for the color it has all standard attributes
+    (@c wxBRUSHSTYLE_SOLID, no stipple bitmap, etc...).

 */
 wxBrush* wxBLACK_BRUSH;
 
 /**
     Grey brush.
 */
 wxBrush* wxBLACK_BRUSH;
 
 /**
     Grey brush.

+    Except for the color it has all standard attributes
+    (@c wxBRUSHSTYLE_SOLID, no stipple bitmap, etc...).

 */
 wxBrush* wxGREY_BRUSH;
 
 /**
     Medium grey brush.
 */
 wxBrush* wxGREY_BRUSH;
 
 /**
     Medium grey brush.

+    Except for the color it has all standard attributes
+    (@c wxBRUSHSTYLE_SOLID, no stipple bitmap, etc...).

 */
 wxBrush* wxMEDIUM_GREY_BRUSH;
 
 /**
     Light grey brush.
 */
 wxBrush* wxMEDIUM_GREY_BRUSH;
 
 /**
     Light grey brush.

+    Except for the color it has all standard attributes
+    (@c wxBRUSHSTYLE_SOLID, no stipple bitmap, etc...).

 */
 wxBrush* wxLIGHT_GREY_BRUSH;
 
 /**
     Transparent brush.
 */
 wxBrush* wxLIGHT_GREY_BRUSH;
 
 /**
     Transparent brush.

+    Except for the color it has all standard attributes
+    (@c wxBRUSHSTYLE_SOLID, no stipple bitmap, etc...).

 */
 wxBrush* wxTRANSPARENT_BRUSH;
 
 /**
     Cyan brush.
 */
 wxBrush* wxTRANSPARENT_BRUSH;
 
 /**
     Cyan brush.

+    Except for the color it has all standard attributes
+    (@c wxBRUSHSTYLE_SOLID, no stipple bitmap, etc...).

 */
 wxBrush* wxCYAN_BRUSH;
 
 /**
     Red brush.
 */
 wxBrush* wxCYAN_BRUSH;
 
 /**
     Red brush.

+    Except for the color it has all standard attributes
+    (@c wxBRUSHSTYLE_SOLID, no stipple bitmap, etc...).

 */
 wxBrush* wxRED_BRUSH;
 
 */
 wxBrush* wxRED_BRUSH;