From: Stefan Neis Date: Sun, 9 May 2004 17:30:57 +0000 (+0000) Subject: Added missing "const" for operator== and operator!=. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0e70f525fa60baefd9878758374b2019b804df82 Added missing "const" for operator== and operator!=. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/os2/accel.h b/include/wx/os2/accel.h index 0f842eeac2..1614b06818 100644 --- a/include/wx/os2/accel.h +++ b/include/wx/os2/accel.h @@ -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; diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h index e1dc95769e..eee0aeba20 100644 --- a/include/wx/os2/cursor.h +++ b/include/wx/os2/cursor.h @@ -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); } diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index 3f138fb02a..ca57b257cc 100644 --- a/include/wx/os2/icon.h +++ b/include/wx/os2/icon.h @@ -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; } diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h index c10cd42933..996c190f83 100644 --- a/include/wx/os2/metafile.h +++ b/include/wx/os2/metafile.h @@ -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: }; diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h index e3ab2ac73b..9d445157d1 100644 --- a/include/wx/os2/palette.h +++ b/include/wx/os2/palette.h @@ -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); diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index dfee541b9b..fe4c3460ef 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -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); }