X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..55bfbcb92b41ab1c6a0d490f2f3fcadefc069bb7:/include/wx/mac/carbon/icon.h diff --git a/include/wx/mac/carbon/icon.h b/include/wx/mac/carbon/icon.h index 3adb3f7e0d..5e786bca58 100644 --- a/include/wx/mac/carbon/icon.h +++ b/include/wx/mac/carbon/icon.h @@ -29,22 +29,24 @@ public: { LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON); } - ~wxIcon(); + + wxIcon(WXHICON icon, const wxSize& size); + + virtual ~wxIcon(); bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , int desiredWidth /* = -1 */ , int desiredHeight = -1); bool LoadFile(const wxString& name ,wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE ) { return LoadFile( name , flags , -1 , -1 ) ; } - bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; } - bool operator!=(const wxIcon& icon) const { return !(*this == icon); } // create from bitmap (which should have a mask unless it's monochrome): // there shouldn't be any implicit bitmap -> icon conversion (i.e. no // ctors, assignment operators...), but it's ok to have such function void CopyFromBitmap(const wxBitmap& bmp); - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; int GetWidth() const; int GetHeight() const; int GetDepth() const;