X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..90ac8b50051f0ba0ff92a159f9bc97db80024910:/include/wx/cocoa/icon.h diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h index 93e822526d..8e4214f31d 100644 --- a/include/wx/cocoa/icon.h +++ b/include/wx/cocoa/icon.h @@ -6,7 +6,7 @@ // Created: 2003/08/11 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COCOA_ICON_H__ @@ -33,7 +33,7 @@ public: { LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON); } - ~wxIcon(); + virtual ~wxIcon(); bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , int desiredWidth /* = -1 */ , int desiredHeight = -1); @@ -49,7 +49,8 @@ public: // 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; @@ -57,4 +58,5 @@ public: bool CreateFromXpm(const char **bits); }; -#endif // _WX_COCOA_ICON_H__ +#endif + // _WX_COCOA_ICON_H__