X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..4fdfe2f3ae110c1f1ba2d925749cac5b761eff4b:/src/mgl/pen.cpp

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index 4c63041cbf..83ad3603da 100644
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -29,21 +29,37 @@
 
 class wxPenRefData: public wxObjectRefData
 {
-    public:
-        wxPenRefData();
-        wxPenRefData(const wxPenRefData& data);
-
-        int            m_width;
-        int            m_style;
-        wxColour       m_colour;
-        wxBitmap       m_stipple;
-        pixpattern24_t m_pixPattern;
-
-        // not used by wxMGL, but we want to preserve values
-        int            m_joinStyle;
-        int            m_capStyle;
-        int            m_countDashes;
-        wxDash        *m_dash;
+public:
+    wxPenRefData();
+    wxPenRefData(const wxPenRefData& data);
+
+    bool operator==(const wxPenRefData& data) const
+    {
+        // we intentionally don't compare m_hPen fields here
+        return m_style == data.m_style &&
+               m_width == data.m_width &&
+               memcmp(&m_pixPattern,
+                      &data.m_pixPattern, sizeof(m_pixPattern)) == 0 &&
+               m_capStyle == data.m_capStyle &&
+               m_joinStyle == data.m_joinStyle &&
+               m_colour == data.m_colour &&
+               (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&
+               (m_style != wxUSER_DASH ||
+                (m_dash == data.m_dash &&
+                    memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0));
+    }
+
+    int            m_width;
+    int            m_style;
+    wxColour       m_colour;
+    wxBitmap       m_stipple;
+    pixpattern24_t m_pixPattern;
+
+    // not used by wxMGL, but we want to preserve values
+    int            m_joinStyle;
+    int            m_capStyle;
+    int            m_countDashes;
+    wxDash        *m_dash;
 };
 
 wxPenRefData::wxPenRefData()
@@ -109,7 +125,11 @@ wxPen::wxPen(const wxBitmap& stipple, int width)
 
 bool wxPen::operator == (const wxPen& pen) const
 {
-    return m_refData == pen.m_refData;
+    if (m_refData == pen.m_refData) return true;
+
+    if (!m_refData || !pen.m_refData) return false;
+
+    return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
 }
 
 bool wxPen::operator != (const wxPen& pen) const