fix for HP and IBM compilers, calls to static template functions must be qualified

[wxWidgets.git] / src / mgl / pen.cpp

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index 5879052da596f7efada4ef8e602688346b628602..83ad3603dabefe5d3b30f243e1b5c0199a1d2bb1 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -29,36 +29,37 @@
 
 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 &&

-               (m_style != wxSTIPPLE || m_stipple.IsRefTo(&data.m_stipple)) &&
+               (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));
     }
 
                (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;
+    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()