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 3545f9b975d2e721a22de6909608de9140e73135..e990a3b94cd49060f90c37064c76635cf81ab102 100644 (file)
--- a/wxPython/src/_brush.i
+++ b/wxPython/src/_brush.i
@@ -33,6 +33,8 @@ a `wx.DC`.  It has a colour and a style.", "
 :see: `wx.BrushList`, `wx.DC`, `wx.DC.SetBrush`
 ");
 
 :see: `wx.BrushList`, `wx.DC`, `wx.DC.SetBrush`
 ");
 

+MustHaveApp(wxBrush);
+

 class wxBrush : public wxGDIObject {
 public:
     DocCtorStr(
 class wxBrush : public wxGDIObject {
 public:
     DocCtorStr(


@@ -54,8 +56,14 @@ public:
     wx.VERTICAL_HATCH     Vertical hatch.
     ===================   =============================
 
     wx.VERTICAL_HATCH     Vertical hatch.
     ===================   =============================
 

+:see: `wx.BrushFromBitmap`

 ");
 
 ");
 

+    DocCtorStrName(
+        wxBrush(const wxBitmap& stippleBitmap),
+        "Constructs a stippled brush using a bitmap.", "",
+        BrushFromBitmap);
+

     ~wxBrush();
 
 
     ~wxBrush();
 
 


@@ -87,10 +95,16 @@ styles.", "");
 have a wx.STIPPLE style, then the return value may be non-None but an
 uninitialised bitmap (`wx.Bitmap.Ok` returns False).", "");
 
 have a wx.STIPPLE style, then the return value may be non-None but an
 uninitialised bitmap (`wx.Bitmap.Ok` returns False).", "");
 

+    
+    DocDeclStr(
+        bool , IsHatch() const,
+        "Is the current style a hatch type?", "");
+    

 
     DocDeclStr(
 
     DocDeclStr(

-        bool , Ok(),
+        bool , IsOk(),

         "Returns True if the brush is initialised and valid.", "");
         "Returns True if the brush is initialised and valid.", "");

+    %pythoncode { Ok = IsOk }

 
 
 #ifdef __WXMAC__
 
 
 #ifdef __WXMAC__


@@ -98,7 +112,12 @@ uninitialised bitmap (`wx.Bitmap.Ok` returns False).", "");
     void MacSetTheme(short macThemeBrush);
 #endif
 
     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`");
+

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------