X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/322913cef36b156a4a9722ce6a68845e3219e615..6a52ea5cb81dcd07c286d34b80945534780fe05f:/wxPython/src/_imaglist.i?ds=sidebyside diff --git a/wxPython/src/_imaglist.i b/wxPython/src/_imaglist.i index 87962cdbab..b0c0974868 100644 --- a/wxPython/src/_imaglist.i +++ b/wxPython/src/_imaglist.i @@ -33,6 +33,8 @@ enum { }; +MustHaveApp(wxImageList); + // wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to // images for their items by an index into an image list. @@ -41,22 +43,26 @@ enum { // 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); + %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; + #ifdef __WXMSW__ bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap); #else -// %name(ReplaceIcon)bool Replace(int index, const wxIcon& icon); +// %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); + const bool solidBackground = false); int GetImageCount(); bool Remove(int index);