Added missing "const" for operator== and operator!=.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7d59475e80
commit
0e70f525fa
@ -46,9 +46,9 @@ public:
|
||||
|
||||
inline wxAcceleratorTable& operator = (const wxAcceleratorTable& rAccel)
|
||||
{ if (*this == rAccel) return (*this); Ref(rAccel); return *this; };
|
||||
inline bool operator == (const wxAcceleratorTable& rAccel)
|
||||
inline bool operator== (const wxAcceleratorTable& rAccel) const
|
||||
{ return m_refData == rAccel.m_refData; };
|
||||
inline bool operator != (const wxAcceleratorTable& rAccel)
|
||||
inline bool operator!= (const wxAcceleratorTable& rAccel) const
|
||||
{ return m_refData != rAccel.m_refData; };
|
||||
|
||||
bool Ok() const;
|
||||
|
@ -58,8 +58,8 @@ public:
|
||||
Ref(rCursor);
|
||||
return *this;
|
||||
}
|
||||
inline bool operator == (const wxCursor& rCursor) { return m_refData == rCursor.m_refData; }
|
||||
inline bool operator != (const wxCursor& rCursor) { return m_refData != rCursor.m_refData; }
|
||||
inline bool operator == (const wxCursor& rCursor) const { return m_refData == rCursor.m_refData; }
|
||||
inline bool operator != (const wxCursor& rCursor) const { return m_refData != rCursor.m_refData; }
|
||||
|
||||
inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
|
||||
inline void SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); }
|
||||
|
@ -81,9 +81,9 @@ public:
|
||||
|
||||
inline wxIcon& operator = (const wxIcon& rIcon)
|
||||
{ if (*this != rIcon) Ref(rIcon); return *this; }
|
||||
inline bool operator == (const wxIcon& rIcon)
|
||||
inline bool operator == (const wxIcon& rIcon) const
|
||||
{ return m_refData == rIcon.m_refData; }
|
||||
inline bool operator != (const wxIcon& rIcon)
|
||||
inline bool operator != (const wxIcon& rIcon) const
|
||||
{ return m_refData != rIcon.m_refData; }
|
||||
|
||||
wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
|
||||
|
@ -74,9 +74,12 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
|
||||
void SetWindowsMappingMode(int mm);
|
||||
|
||||
// Operators
|
||||
inline wxMetafile& operator = (const wxMetafile& metafile) { if (*this == metafile) return (*this); Ref(metafile); return *this; }
|
||||
inline bool operator == (const wxMetafile& metafile) { return m_refData == metafile.m_refData; }
|
||||
inline bool operator != (const wxMetafile& metafile) { return m_refData != metafile.m_refData; }
|
||||
inline wxMetafile& operator = (const wxMetafile& metafile)
|
||||
{ if (*this == metafile) return (*this); Ref(metafile); return *this; }
|
||||
inline bool operator== (const wxMetafile& metafile) const
|
||||
{ return m_refData == metafile.m_refData; }
|
||||
inline bool operator!= (const wxMetafile& metafile) const
|
||||
{ return m_refData != metafile.m_refData; }
|
||||
|
||||
protected:
|
||||
};
|
||||
|
@ -63,8 +63,10 @@ public:
|
||||
virtual bool Ok(void) const { return (m_refData != NULL) ; }
|
||||
|
||||
inline wxPalette& operator = (const wxPalette& rPalette) { if (*this == rPalette) return (*this); Ref(rPalette); return *this; }
|
||||
inline bool operator == (const wxPalette& rPalette) { return m_refData == rPalette.m_refData; }
|
||||
inline bool operator != (const wxPalette& rPalette) { return m_refData != rPalette.m_refData; }
|
||||
inline bool operator == (const wxPalette& rPalette) const
|
||||
{ return m_refData == rPalette.m_refData; }
|
||||
inline bool operator != (const wxPalette& rPalette) const
|
||||
{ return m_refData != rPalette.m_refData; }
|
||||
|
||||
virtual bool FreeResource(bool bForce = FALSE);
|
||||
|
||||
|
@ -55,9 +55,12 @@ public:
|
||||
inline wxPen(const wxPen& rPen) { Ref(rPen); }
|
||||
~wxPen();
|
||||
|
||||
inline wxPen& operator = (const wxPen& rPen) { if (*this == rPen) return (*this); Ref(rPen); return *this; }
|
||||
inline bool operator == (const wxPen& rPen) { return m_refData == rPen.m_refData; }
|
||||
inline bool operator != (const wxPen& rPen) { return m_refData != rPen.m_refData; }
|
||||
inline wxPen& operator = (const wxPen& rPen)
|
||||
{ if (*this == rPen) return (*this); Ref(rPen); return *this; }
|
||||
inline bool operator == (const wxPen& rPen) const
|
||||
{ return m_refData == rPen.m_refData; }
|
||||
inline bool operator != (const wxPen& rPen) const
|
||||
{ return m_refData != rPen.m_refData; }
|
||||
|
||||
virtual bool Ok(void) const { return (m_refData != NULL); }
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user