Use %rename("%(wxpy)s")

[wxWidgets.git] / wxPython / src / _imaglist.i

diff --git a/wxPython/src/_imaglist.i b/wxPython/src/_imaglist.i
index 87962cdbab25bbb5116a865027525072785a95ab..a47dd81a3d2328c141432607e9ed54230ba68d1c 100644 (file)
--- 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.
 
 //  wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to
 //  images for their items by an index into an image list.


@@ -41,22 +43,20 @@ enum {
 //  two bitmaps, or an icon.
 class wxImageList : public wxObject {
 public:
 //  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);
     ~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);
     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,
 
     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);
 
     int GetImageCount();
     bool Remove(int index);