X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b8c7ba607a15a2ff8a04448138df9ffff7df6c5..30e24d9dd5a5abf1c9a375ea259eb239b122b7f7:/wxPython/src/_icon.i?ds=sidebyside diff --git a/wxPython/src/_icon.i b/wxPython/src/_icon.i index d117a99ff6..0e3ff73d7a 100644 --- a/wxPython/src/_icon.i +++ b/wxPython/src/_icon.i @@ -65,7 +65,8 @@ public: void SetHandle(long handle) { self->SetHandle((WXHANDLE)handle); } } #endif - bool Ok(); + bool IsOk(); + %pythoncode { Ok = IsOk } int GetWidth(); int GetHeight(); int GetDepth(); @@ -77,7 +78,12 @@ public: #endif void CopyFromBitmap(const wxBitmap& bmp); - %pythoncode { def __nonzero__(self): return self.Ok() } + %pythoncode { def __nonzero__(self): return self.IsOk() } + + %property(Depth, GetDepth, SetDepth, doc="See `GetDepth` and `SetDepth`"); + %property(Height, GetHeight, SetHeight, doc="See `GetHeight` and `SetHeight`"); + %property(Width, GetWidth, SetWidth, doc="See `GetWidth` and `SetWidth`"); + }; //--------------------------------------------------------------------------- @@ -101,7 +107,7 @@ public: // returns True if this object is valid/initialized bool IsOk() const; - %pythoncode { def __nonzero__(self): return self.Ok() } + %pythoncode { def __nonzero__(self): return self.IsOk() } // set/get the icon file name void SetFileName(const wxString& filename); @@ -124,6 +130,10 @@ public: #endif } } + + %property(FileName, GetFileName, SetFileName, doc="See `GetFileName` and `SetFileName`"); + %property(Index, GetIndex, SetIndex, doc="See `GetIndex` and `SetIndex`"); + }; @@ -159,6 +169,8 @@ public: // returns the icon with size wxSYS_ICON_[XY]; if no such icon exists, // returns the first icon in the bundle const wxIcon& GetIcon( const wxSize& size ) const; + + %property(Icon, GetIcon, doc="See `GetIcon`"); }; //---------------------------------------------------------------------------