Apply parts of patch #1719888 to fix compilation on Mac and with

[wxWidgets.git] / wxPython / src / _brush.i

diff --git a/wxPython/src/_brush.i b/wxPython/src/_brush.i
index 6f39b239ef9fb01daccfe72037ab4d6dd1b165c6..e990a3b94cd49060f90c37064c76635cf81ab102 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();
 
 
@@ -96,8 +102,9 @@ uninitialised bitmap (`wx.Bitmap.Ok` returns False).", "");
     
 
     DocDeclStr(
-        bool , Ok(),
+        bool , IsOk(),
         "Returns True if the brush is initialised and valid.", "");
+    %pythoncode { Ok = IsOk }
 
 
 #ifdef __WXMAC__
@@ -105,7 +112,12 @@ uninitialised bitmap (`wx.Bitmap.Ok` returns False).", "");
     void MacSetTheme(short macThemeBrush);
 #endif
 
-    %pythoncode { def __nonzero__(self): return self.Ok() }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }
+
+    %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`");
+    %property(Stipple, GetStipple, SetStipple, doc="See `GetStipple` and `SetStipple`");
+    %property(Style, GetStyle, SetStyle, doc="See `GetStyle` and `SetStyle`");
+
 };
 
 //---------------------------------------------------------------------------