bitwise vs. logical operator

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

diff --git a/wxPython/src/_imaglist.i b/wxPython/src/_imaglist.i
index fafc8ae3e2e7a6432d6d33bb1c0b9d712cb37af6..9a63bb10b8cdb09e28c670e77bbb763f4495b81d 100644 (file)
--- a/wxPython/src/_imaglist.i
+++ b/wxPython/src/_imaglist.i
@@ -43,8 +43,14 @@ MustHaveApp(wxImageList);
 //  two bitmaps, or an icon.
 class wxImageList : public wxObject {
 public:
+    // turn off this typemap
+    %typemap(out) wxImageList*;    
+
     wxImageList(int width, int height, int mask=true, int initialCount=1);
     ~wxImageList();
+    
+    // Turn it back on again
+    %typemap(out) wxImageList* { $result = wxPyMake_wxObject($1, $owner); }
 
     int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
     %Rename(AddWithColourMask,int, Add(const wxBitmap& bitmap, const wxColour& maskColour));
@@ -66,6 +72,8 @@ public:
         void, GetSize(int index, int& OUTPUT, int& OUTPUT),
         "GetSize(index) -> (width,height)");
         
+    %property(ImageCount, GetImageCount, doc="See `GetImageCount`");
+    %property(Size, GetSize, doc="See `GetSize`");
 };
 
 //---------------------------------------------------------------------------