X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b8c7ba607a15a2ff8a04448138df9ffff7df6c5..5f2502393e042e6e2c871ff94b7ccaf7a78b264d:/wxPython/src/_imaglist.i?ds=sidebyside diff --git a/wxPython/src/_imaglist.i b/wxPython/src/_imaglist.i index f2b32ab3fe..d048849da2 100644 --- a/wxPython/src/_imaglist.i +++ b/wxPython/src/_imaglist.i @@ -49,13 +49,11 @@ public: int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap); %Rename(AddWithColourMask,int, Add(const wxBitmap& bitmap, const wxColour& maskColour)); %Rename(AddIcon,int, Add(const wxIcon& icon)); -#ifdef __WXMSW__ + + wxBitmap GetBitmap(int index) const; + wxIcon GetIcon(int index) const; + bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap); -#else -// %Rename(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); @@ -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`"); }; //---------------------------------------------------------------------------