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.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index c737885a0192e78a2fe2b32b1451f1f1726a9d14..6dc7155ea71a576016bb2d6294bd227c6fc10051 100644 (file)
--- 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 6f39b239ef9fb01daccfe72037ab4d6dd1b165c6..99fbe50fb9fdfecd66447fa72a4013de7d3775d4 100644 (file)
--- 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 46fcd11a0a9e182d427d6132e00b06cd78690515..800002497aeab521fffeb44cbcc72f01115f597a 100644 (file)
--- 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,