X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ff9b17d57afa08af355bee49f7ebbcef67e3aef..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/interface/wx/bitmap.h?ds=sidebyside diff --git a/interface/wx/bitmap.h b/interface/wx/bitmap.h index 4874563bd4..1b185d7f3c 100644 --- a/interface/wx/bitmap.h +++ b/interface/wx/bitmap.h @@ -165,7 +165,7 @@ public: If you need direct access the bitmap data instead going through drawing to it using wxMemoryDC you need to use the wxPixelData class (either wxNativePixelData for RGB bitmaps or wxAlphaPixelData - for bitmaps with an additionaly alpha channel). + for bitmaps with an additionally alpha channel). Note that many wxBitmap functions take a @e type parameter, which is a value of the ::wxBitmapType enumeration. @@ -276,7 +276,7 @@ public: In wxPerl use Wx::Bitmap->newFromBits(bits, width, height, depth). @endWxPerlOnly */ - wxBitmap(const char* bits[], int width, int height, int depth = 1); + wxBitmap(const char bits[], int width, int height, int depth = 1); /** Creates a new bitmap. A depth of ::wxBITMAP_SCREEN_DEPTH indicates the @@ -710,19 +710,11 @@ public: /** Constructs a mask from a monochrome bitmap. - - @beginWxPythonOnly - This is the default constructor for wxMask in wxPython. - @endWxPythonOnly */ wxMask(const wxBitmap& bitmap); /** Constructs a mask from a bitmap and a colour that indicates the background. - - @beginWxPythonOnly - wxPython has an alternate wxMask constructor matching this form called wxMaskColour. - @endWxPythonOnly */ wxMask(const wxBitmap& bitmap, const wxColour& colour);