fixed deadlock when calling wxPostEvent() from worker thread

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

diff --git a/wxPython/src/_imaglist.i b/wxPython/src/_imaglist.i
index b5df300010bb2d00c529eccfc4c56be7709803f6..9a63bb10b8cdb09e28c670e77bbb763f4495b81d 100644 (file)
--- a/wxPython/src/_imaglist.i
+++ b/wxPython/src/_imaglist.i
@@ -43,19 +43,23 @@ MustHaveApp(wxImageList);
 //  two bitmaps, or an icon.
 class wxImageList : public wxObject {
 public:
 //  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();
     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);
 
     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,
               const bool solidBackground = false);
 
     bool Draw(int index, wxDC& dc, int x, int x, int flags = wxIMAGELIST_DRAW_NORMAL,
               const bool solidBackground = false);


@@ -66,8 +70,10 @@ public:
 
     DocDeclA(
         void, GetSize(int index, int& OUTPUT, int& OUTPUT),
 
     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`");

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------