cleanup - reformatting

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

diff --git a/wxPython/src/_imaglist.i b/wxPython/src/_imaglist.i
index f436666cb889646ff8082e921eee0446702a9ee9..b0c0974868fcb257c30d2a7ddf0b26b40530f613 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.
@@ -41,27 +43,35 @@ 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);
     bool RemoveAll();
-    void GetSize(int index, int& OUTPUT, int& OUTPUT);
+
+    DocDeclA(
+        void, GetSize(int index, int& OUTPUT, int& OUTPUT),
+        "GetSize() -> (width,height)");
+        
 };
 
 //---------------------------------------------------------------------------