don't crash if (char*)c_str() is used twice in a row on the same string and both...

[wxWidgets.git] / include / wx / os2 / brush.h

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index c7657279d543d5cceab9e95f4c4a3a163cdbc3af..c37808f3ef6a837729f8f6df55add2039d692178 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -26,6 +26,13 @@ public:
     wxBrushRefData(const wxBrushRefData& rData);
     virtual ~wxBrushRefData();
 
     wxBrushRefData(const wxBrushRefData& rData);
     virtual ~wxBrushRefData();
 

+    bool operator == (const wxBrushRefData& data) const
+    {
+        return (m_nStyle == data.m_nStyle &&
+                m_vStipple.IsSameAs(data.m_vStipple) &&
+                m_vColour == data.m_vColour);
+    }
+

 protected:
     int         m_nStyle;
     wxBitmap    m_vStipple ;
 protected:
     int         m_nStyle;
     wxBitmap    m_vStipple ;


@@ -47,8 +54,8 @@ public:
     wxBrush(const wxBitmap& rStipple);
     virtual ~wxBrush();
 
     wxBrush(const wxBitmap& rStipple);
     virtual ~wxBrush();
 

-    inline bool operator == (const wxBrush& rBrush) const { return m_refData == rBrush.m_refData; }
-    inline bool operator != (const wxBrush& rBrush) const { return m_refData != rBrush.m_refData; }
+    bool operator == (const wxBrush& rBrush) const;
+    inline bool operator != (const wxBrush& rBrush) const { return !(*this == rBrush); }

 
     virtual void SetColour(const wxColour& rColour);
     virtual void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBrush);
 
     virtual void SetColour(const wxColour& rColour);
     virtual void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBrush);