X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab1f7d2aa9cb1857cf87e105ebbd36a92676bbde..c437fde9f90fc7dfcac79053d214fc9146d7be21:/wxPython/src/_icon.i diff --git a/wxPython/src/_icon.i b/wxPython/src/_icon.i index f43e09910b..d117a99ff6 100644 --- a/wxPython/src/_icon.i +++ b/wxPython/src/_icon.i @@ -30,15 +30,17 @@ public: ~wxIcon(); // alternate constructors - %name(EmptyIcon) wxIcon(); - %name(IconFromLocation) wxIcon(const wxIconLocation& loc); + %RenameCtor(EmptyIcon, wxIcon()); + %RenameCtor(IconFromLocation, wxIcon(const wxIconLocation& loc)); %extend { - %name(IconFromBitmap) wxIcon(const wxBitmap& bmp) { + %RenameCtor(IconFromBitmap, wxIcon(const wxBitmap& bmp)) + { wxIcon* icon = new wxIcon(); icon->CopyFromBitmap(bmp); return icon; } - %name(IconFromXPMData) wxIcon(PyObject* listOfStrings) { + %RenameCtor(IconFromXPMData, wxIcon(PyObject* listOfStrings)) + { char** cArray = NULL; wxIcon* icon; @@ -136,10 +138,10 @@ public: wxIconBundle(); // initializes the bundle with the icon(s) found in the file - %name(IconBundleFromFile) wxIconBundle( const wxString& file, long type ); + %RenameCtor(IconBundleFromFile, wxIconBundle( const wxString& file, long type )); // initializes the bundle with a single icon - %name(IconBundleFromIcon)wxIconBundle( const wxIcon& icon ); + %RenameCtor(IconBundleFromIcon, wxIconBundle( const wxIcon& icon )); ~wxIconBundle(); @@ -151,7 +153,7 @@ public: // adds all the icons contained in the file to the collection, // if the collection already contains icons with the same // width and height, they are replaced - %name(AddIconFromFile)void AddIcon( const wxString& file, long type ); + %Rename(AddIconFromFile,void, AddIcon( const wxString& file, long type )); // returns the icon with the given size; if no such icon exists, // returns the icon with size wxSYS_ICON_[XY]; if no such icon exists,