fix from Francesco for the latest version of wxPresets

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

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index 3594ffebec0f1cad7492a4bb024db81b65e85277..151aef81184186bd257c821d02b0e3673ccce86e 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -27,6 +27,20 @@ public:
     wxPenRefData(const wxPenRefData& rData);
     virtual ~wxPenRefData();
 
+    bool operator==(const wxPenRefData& data) const
+    {
+        // we intentionally don't compare m_hPen fields here
+        return m_nStyle == data.m_nStyle &&
+               m_nWidth == data.m_nWidth &&
+               m_nJoin == data.m_nJoin &&
+               m_nCap == data.m_nCap &&
+               m_vColour == data.m_vColour &&
+               (m_nStyle != wxSTIPPLE || m_vStipple.IsSameAs(data.m_vStipple)) &&
+               (m_nStyle != wxUSER_DASH ||
+                (m_dash == data.m_dash &&
+                    memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
+    }
+
 protected:
     int                             m_nWidth;
     int                             m_nStyle;
@@ -57,11 +71,18 @@ public:
     virtual ~wxPen();
 
     inline bool   operator == (const wxPen& rPen) const
-        { return m_refData == rPen.m_refData; }
+    {
+        const wxPenRefData *penData = (wxPenRefData *)rPen.m_refData;
+
+        // an invalid pen is only equal to another invalid pen
+        return m_refData ? penData && *M_PENDATA == *penData : !penData;
+    }
+
     inline bool   operator != (const wxPen& rPen) const
-        { return m_refData != rPen.m_refData; }
+        { return !(*this == rPen); }
 
-    virtual bool Ok(void) const { return (m_refData != NULL); }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk(void) const { return (m_refData != NULL); }
 
     //
     // Override in order to recreate the pen
@@ -104,7 +125,7 @@ public:
     //
     bool     RealizeResource(void);
     bool     FreeResource(bool bForce = false);
-    WXHANDLE GetResourceHandle(void);
+    virtual WXHANDLE GetResourceHandle(void) const;
     bool     IsFree(void) const;
     void     Unshare(void);