X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/452418c4b0763eb611432e84f077c9766e282057..a3ab1c18017bb08329e73918f9f502ea00cdb447:/include/wx/cocoa/bitmap.h diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h index 4eccb2eb7c..0cd2cd66b1 100644 --- a/include/wx/cocoa/bitmap.h +++ b/include/wx/cocoa/bitmap.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/cocoa/bitmap.h +// Name: wx/cocoa/bitmap.h // Purpose: wxBitmap class // Author: David Elliott // Modified by: // Created: 2003/07/19 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_BITMAP_H__ @@ -86,7 +86,7 @@ public: // destructor virtual ~wxBitmap(); - + // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ @@ -107,7 +107,8 @@ public: // get the given part of bitmap wxBitmap GetSubBitmap( const wxRect& rect ) const; - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; int GetWidth() const; int GetHeight() const; int GetDepth() const; @@ -130,11 +131,6 @@ public: void SetMask(wxMask *mask) ; int GetBitmapType() const; - - inline bool operator == (const wxBitmap& bitmap) const - { return m_refData == bitmap.m_refData; } - inline bool operator != (const wxBitmap& bitmap) const - { return m_refData != bitmap.m_refData; } // wxObjectRefData wxObjectRefData *CreateRefData() const; @@ -154,4 +150,5 @@ class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase DECLARE_ABSTRACT_CLASS(wxBitmapHandler) }; -#endif // __WX_COCOA_BITMAP_H__ +#endif + // __WX_COCOA_BITMAP_H__