diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt index c737885a01..6dc7155ea7 100644 --- a/wxPython/docs/CHANGES.txt +++ b/wxPython/docs/CHANGES.txt @@ -1,6 +1,18 @@ Recent Changes for wxPython ===================================================================== + +2.6.0.1 +------- + +Added wx.BrushFromBitmap to create a stippled brush in a single step. +Also added missing brysh style flags: wx.STIPPLE_MASK +wx.STIPPLE_MASK_OPAQUE. + + + + + 2.6.0.0 ------- diff --git a/wxPython/src/_brush.i b/wxPython/src/_brush.i index 6f39b239ef..99fbe50fb9 100644 --- a/wxPython/src/_brush.i +++ b/wxPython/src/_brush.i @@ -56,8 +56,14 @@ public: wx.VERTICAL_HATCH Vertical hatch. =================== ============================= +:see: `wx.BrushFromBitmap` "); + DocCtorStrName( + wxBrush(const wxBitmap& stippleBitmap), + "Constructs a stippled brush using a bitmap.", "", + BrushFromBitmap); + ~wxBrush(); diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index 46fcd11a0a..800002497a 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -785,6 +785,8 @@ enum { wxUSER_DASH, wxTRANSPARENT, wxSTIPPLE, + wxSTIPPLE_MASK, + wxSTIPPLE_MASK_OPAQUE, wxBDIAGONAL_HATCH, wxCROSSDIAG_HATCH, wxFDIAGONAL_HATCH,