update mac gl, after rev 50900

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

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index a072e4b82e6585a9fe6bbd9c81a71fff7c1e9c5a..4d62415e98f70658f699237064d5660357ffca9b 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -16,16 +16,23 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
 
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {
-    friend class WXDLLEXPORT wxBrush;
+    friend class WXDLLIMPEXP_FWD_CORE wxBrush;
 public:
     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 ;
@@ -47,8 +54,8 @@ public:
     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);
@@ -61,8 +68,6 @@ public:
     inline wxBitmap* GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_vStipple : 0); };
     inline int       GetPS(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_hBrush : 0); };
 
-    inline virtual bool Ok(void) const { return (m_refData != NULL) ; }
-
     //
     // Implementation
     //
@@ -71,7 +76,7 @@ public:
     // Useful helper: create the brush resource
     //
     bool     RealizeResource(void);
-    WXHANDLE GetResourceHandle(void) ;
+    virtual WXHANDLE GetResourceHandle(void) const;
     bool     FreeResource(bool bForce = false);
     bool     IsFree(void) const;
     void     Unshare(void);