From 797aa4038fe0fc0f5ce5ebedf2ec3287a88856b2 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 17 May 2000 12:11:17 +0000
Subject: [PATCH] wxMSW & wxMotif: added const to GDI object ==, != operators

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/motif/bitmap.h  | 4 ++--
 include/wx/motif/brush.h   | 4 ++--
 include/wx/motif/icon.h    | 4 ++--
 include/wx/motif/palette.h | 4 ++--
 include/wx/motif/pen.h     | 4 ++--
 include/wx/msw/bitmap.h    | 4 ++--
 include/wx/msw/brush.h     | 4 ++--
 include/wx/msw/palette.h   | 4 ++--
 include/wx/msw/pen.h       | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/wx/motif/bitmap.h b/include/wx/motif/bitmap.h
index c673a408fa..1af6e40347 100644
--- a/include/wx/motif/bitmap.h
+++ b/include/wx/motif/bitmap.h
@@ -183,8 +183,8 @@ public:
   void SetMask(wxMask *mask) ;
 
   wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
-  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; }
 
   // Format handling
   static wxList& GetHandlers() { return sm_handlers; }
diff --git a/include/wx/motif/brush.h b/include/wx/motif/brush.h
index 15488cba9b..03c23ce98a 100644
--- a/include/wx/motif/brush.h
+++ b/include/wx/motif/brush.h
@@ -56,8 +56,8 @@ public:
   virtual void SetStipple(const wxBitmap& stipple)  ;
 
   inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; }
-  inline bool operator == (const wxBrush& brush) { return m_refData == brush.m_refData; }
-  inline bool operator != (const wxBrush& brush) { return m_refData != brush.m_refData; }
+  inline bool operator == (const wxBrush& brush) const { return m_refData == brush.m_refData; }
+  inline bool operator != (const wxBrush& brush) const { return m_refData != brush.m_refData; }
 
   inline wxColour& GetColour() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); };
   inline int GetStyle() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); };
diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index c79cb7bb11..d1176761c5 100644
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -61,8 +61,8 @@ public:
     { return wxBitmap::LoadFile(name, type); }
 
   inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
-  inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
-  inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+  inline bool operator == (const wxIcon& icon) const { return m_refData == icon.m_refData; }
+  inline bool operator != (const wxIcon& icon) const { return m_refData != icon.m_refData; }
 
   virtual bool Ok() const { return ((m_refData != NULL) && (M_ICONDATA->m_ok)); }
 };
diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h
index cf198a273f..b40831a894 100644
--- a/include/wx/motif/palette.h
+++ b/include/wx/motif/palette.h
@@ -66,8 +66,8 @@ public:
   virtual bool Ok() const { return (m_refData != NULL) ; }
 
   wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
-  bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; }
-  bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; }
+  bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
+  bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
 
   // Motif-specific
   WXColormap GetXColormap(WXDisplay* display = NULL) const;
diff --git a/include/wx/motif/pen.h b/include/wx/motif/pen.h
index 120d793d89..b0a30769e1 100644
--- a/include/wx/motif/pen.h
+++ b/include/wx/motif/pen.h
@@ -57,8 +57,8 @@ public:
   ~wxPen();
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
-  inline bool operator == (const wxPen& pen) { return m_refData == pen.m_refData; }
-  inline bool operator != (const wxPen& pen) { return m_refData != pen.m_refData; }
+  inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
+  inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
 
   virtual bool Ok() const { return (m_refData != NULL) ; }
 
diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index cc0989f68b..7b9820cbb0 100644
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -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);
diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 05ae288300..1ec1b80b7e 100644
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -57,8 +57,8 @@ public:
   virtual void SetStipple(const wxBitmap& stipple)  ;
 
   inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; }
-  inline bool operator == (const wxBrush& brush) { return m_refData == brush.m_refData; }
-  inline bool operator != (const wxBrush& brush) { return m_refData != brush.m_refData; }
+  inline bool operator == (const wxBrush& brush) const { return m_refData == brush.m_refData; }
+  inline bool operator != (const wxBrush& brush) const { return m_refData != brush.m_refData; }
 
   inline wxColour& GetColour(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); };
   inline int GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); };
diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index 4383c44a3f..3eaa3ac4ef 100644
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -49,8 +49,8 @@ public:
   virtual bool Ok(void) const { return (m_refData != NULL) ; }
 
   inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
-  inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; }
-  inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; }
+  inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
+  inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
 
   virtual bool FreeResource(bool force = FALSE);
 
diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 719140d8cf..1cf0f4266c 100644
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -57,8 +57,8 @@ public:
   ~wxPen();
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
-  inline bool operator == (const wxPen& pen) { return m_refData == pen.m_refData; }
-  inline bool operator != (const wxPen& pen) { return m_refData != pen.m_refData; }
+  inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
+  inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
 
   virtual bool Ok() const { return (m_refData != NULL) ; }