From 8224a808113a10b21620f817b66f1a333211b773 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 27 Apr 2005 18:57:21 +0000
Subject: [PATCH] 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
---
 wxPython/docs/CHANGES.txt | 12 ++++++++++++
 wxPython/src/_brush.i     |  6 ++++++
 wxPython/src/_defs.i      |  2 ++
 3 files changed, 20 insertions(+)

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,
-- 
2.50.0