X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a72f4631fe5ab7ebeefdacf8ec9c826ea962133f..941afb6b650abdad082742dccbe8e463848ba964:/wxPython/src/_imaglist.i?ds=sidebyside diff --git a/wxPython/src/_imaglist.i b/wxPython/src/_imaglist.i index b5df300010..fafc8ae3e2 100644 --- a/wxPython/src/_imaglist.i +++ b/wxPython/src/_imaglist.i @@ -47,15 +47,13 @@ public: ~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); @@ -66,7 +64,7 @@ public: DocDeclA( void, GetSize(int index, int& OUTPUT, int& OUTPUT), - "GetSize() -> (width,height)"); + "GetSize(index) -> (width,height)"); };