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 0f842eeac24a158d02cfde7b0e4db668a20b8831..1614b06818220af7d555a5c9384cb6d3cfe347e3 100644 (file)
--- 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 e1dc95769ef15d20aa58a52a8e75eb70c7ccc5a9..eee0aeba209a0dea96a408a3c1a6ca8d463fc0a3 100644 (file)
--- 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 3f138fb02a7bfdfef3d716b1779a2182bef69ba0..ca57b257cc809ad7b0b51cb21ac3ff30bdcbac3f 100644 (file)
--- 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 c10cd42933df31f5e5e20b0529bc40a0136a5c46..996c190f8320cab0d1dbd8e8d3b9e2cae64fb693 100644 (file)
--- 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 e3ab2ac73b38f1657831c9fb43ca6fac9cc9751b..9d445157d1412e0c7f584ac91473091d0ed194f1 100644 (file)
--- 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 dfee541b9bb470b0888541ad7c044c0078a42dd9..fe4c3460ef02eb201a439ac14355c4c97e1dbdaf 100644 (file)
--- 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); }