compilation fix for wxPenRefData operator==()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index 45820afcacb297ca14c21354c970736962f10b3b..62db79bdf8d2cf16265d798977f2f673c3ae64cf 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -29,16 +29,17 @@
 
 class wxPenRefData: public wxObjectRefData
 {
 
 class wxPenRefData: public wxObjectRefData
 {

-    public:
-        wxPenRefData();
-        wxPenRefData(const wxPenRefData& data);
+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 &&
 
     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 &&

-               m_pixPattern == data.m_pixPattern &&
+               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_capStyle == data.m_capStyle &&
                m_joinStyle == data.m_joinStyle &&
                m_colour == data.m_colour &&


@@ -48,17 +49,17 @@ class wxPenRefData: public wxObjectRefData
                     memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0));
     }
 
                     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;
+    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()
 };
 
 wxPenRefData::wxPenRefData()