X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab1f7d2aa9cb1857cf87e105ebbd36a92676bbde..5f2502393e042e6e2c871ff94b7ccaf7a78b264d:/wxPython/src/_imaglist.i?ds=inline diff --git a/wxPython/src/_imaglist.i b/wxPython/src/_imaglist.i index 98625e782f..d048849da2 100644 --- a/wxPython/src/_imaglist.i +++ b/wxPython/src/_imaglist.i @@ -43,22 +43,20 @@ MustHaveApp(wxImageList); // two bitmaps, or an icon. class wxImageList : public wxObject { public: - wxImageList(int width, int height, int mask=True, int initialCount=1); + wxImageList(int width, int height, int mask=true, int initialCount=1); ~wxImageList(); int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap); - %name(AddWithColourMask)int Add(const wxBitmap& bitmap, const wxColour& maskColour); - %name(AddIcon)int Add(const wxIcon& icon); -#ifdef __WXMSW__ + %Rename(AddWithColourMask,int, Add(const wxBitmap& bitmap, const wxColour& maskColour)); + %Rename(AddIcon,int, Add(const wxIcon& icon)); + + wxBitmap GetBitmap(int index) const; + wxIcon GetIcon(int index) const; + bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap); -#else -// %name(ReplaceIcon)bool Replace(int index, const wxIcon& icon); -// int Add(const wxBitmap& bitmap); - bool Replace(int index, const wxBitmap& bitmap); -#endif bool Draw(int index, wxDC& dc, int x, int x, int flags = wxIMAGELIST_DRAW_NORMAL, - const bool solidBackground = False); + const bool solidBackground = false); int GetImageCount(); bool Remove(int index); @@ -66,8 +64,10 @@ public: DocDeclA( void, GetSize(int index, int& OUTPUT, int& OUTPUT), - "GetSize() -> (width,height)"); + "GetSize(index) -> (width,height)"); + %property(ImageCount, GetImageCount, doc="See `GetImageCount`"); + %property(Size, GetSize, doc="See `GetSize`"); }; //---------------------------------------------------------------------------