Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made operator==() and \!=() const (still doesn't make them correct probably)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-04-20 11:20:49 +00:00
parent 7a82dabcc7
commit 4b912ef220
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/gtk/icon.h
View File

@@ -38,22 +38,22 @@ public:
// For compatibility with wxMSW where desired size is sometimes required to // For compatibility with wxMSW where desired size is sometimes required to
// distinguish between multiple icons in a resource. // distinguish between multiple icons in a resource.
wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM,
int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) : int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
wxBitmap(filename, type) wxBitmap(filename, type)
{ {
} }
wxIcon( char **bits, int width=-1, int height=-1 ); wxIcon( char **bits, int width=-1, int height=-1 );
wxIcon& operator = (const wxIcon& icon); wxIcon& operator=(const wxIcon& icon);
inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; } bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
inline bool operator != (const wxIcon& icon) { 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): // create from bitmap (which should have a mask unless it's monochrome):
// there shouldn't be any implicit bitmap -> icon conversion (i.e. no // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
// ctors, assignment operators...), but it's ok to have such function // ctors, assignment operators...), but it's ok to have such function
void CopyFromBitmap(const wxBitmap& bmp); void CopyFromBitmap(const wxBitmap& bmp);
private: private:
DECLARE_DYNAMIC_CLASS(wxIcon) DECLARE_DYNAMIC_CLASS(wxIcon)
}; };

10
include/wx/gtk1/icon.h
View File

@@ -38,22 +38,22 @@ public:
// For compatibility with wxMSW where desired size is sometimes required to // For compatibility with wxMSW where desired size is sometimes required to
// distinguish between multiple icons in a resource. // distinguish between multiple icons in a resource.
wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM,
int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) : int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
wxBitmap(filename, type) wxBitmap(filename, type)
{ {
} }
wxIcon( char **bits, int width=-1, int height=-1 ); wxIcon( char **bits, int width=-1, int height=-1 );
wxIcon& operator = (const wxIcon& icon); wxIcon& operator=(const wxIcon& icon);
inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; } bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
inline bool operator != (const wxIcon& icon) { 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): // create from bitmap (which should have a mask unless it's monochrome):
// there shouldn't be any implicit bitmap -> icon conversion (i.e. no // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
// ctors, assignment operators...), but it's ok to have such function // ctors, assignment operators...), but it's ok to have such function
void CopyFromBitmap(const wxBitmap& bmp); void CopyFromBitmap(const wxBitmap& bmp);
private: private:
DECLARE_DYNAMIC_CLASS(wxIcon) DECLARE_DYNAMIC_CLASS(wxIcon)
}; };