merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -142,8 +142,8 @@ public:
|
||||
wxMask *GetMask() const { return (GetBitmapData() ? GetBitmapData()->m_bitmapMask : (wxMask*) NULL); }
|
||||
void SetMask(wxMask *mask) ;
|
||||
|
||||
bool operator==(const wxBitmap& bitmap) { return m_refData == bitmap.m_refData; }
|
||||
bool operator!=(const wxBitmap& bitmap) { return m_refData != bitmap.m_refData; }
|
||||
bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
|
||||
bool operator!=(const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2
|
||||
void SetOk(bool isOk);
|
||||
|
Reference in New Issue
Block a user