X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c383901330c5c6d53a277c0549ae0eac6f0ecff..587d0f36148e7d0e77f1e4f6009dcf6785f2b7e4:/wxPython/src/_bitmap.i diff --git a/wxPython/src/_bitmap.i b/wxPython/src/_bitmap.i index 96a6329a78..93fa2a2b93 100644 --- a/wxPython/src/_bitmap.i +++ b/wxPython/src/_bitmap.i @@ -150,8 +150,8 @@ bit depths, the behaviour is platform dependent.", ""); %RenameCtor(BitmapFromBits, wxBitmap(PyObject* bits, int width, int height, int depth=1 )) { - char* buf; - int length; + char* buf; + Py_ssize_t length; PyString_AsStringAndSize(bits, &buf, &length); return new wxBitmap(buf, width, height, depth); } @@ -201,6 +201,7 @@ bitmap. This preserves mask information so that bitmaps and images can be converted back and forth without loss in that respect.", ""); + DocDeclStr( virtual wxMask* , GetMask() const, "Gets the associated mask (if any) which may have been loaded from a @@ -211,13 +212,14 @@ file or explpicitly set for the bitmap. // MSW only? wxBitmap GetMaskBitmap() const; + %disownarg(wxMask*); DocDeclStr( virtual void , SetMask(wxMask* mask), "Sets the mask for this bitmap. :see: `GetMask`, `wx.Mask` ", ""); - + %cleardisown(wxMask*); %extend { DocStr(SetMaskColour, @@ -338,7 +340,7 @@ passed then BLACK is used. } } - //~wxMask(); + ~wxMask(); }; %pythoncode { MaskColour = wx._deprecated(Mask, "wx.MaskColour is deprecated, use `wx.Mask` instead.") }