fixed operator=(), ==() and !=() for wxPen

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

include/wx/msw/pen.h

@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        pen.h
+// Name:        wx/pen.h
 // Purpose:     wxPen class
 // Author:      Julian Smart
-// Modified by:
+// Modified by: Vadim Zeitlin: fixed operator=(), ==(), !=()
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
@@ -24,13 +24,27 @@ typedef WXDWORD wxMSWDash;
 
 class WXDLLEXPORT wxPen;
 
+// VZ: this class should be made private
 class WXDLLEXPORT wxPenRefData : public wxGDIRefData
 {
-    friend class WXDLLEXPORT wxPen;
 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& data);
-    ~wxPenRefData();
+    virtual ~wxPenRefData();
+
+    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_join == data.m_join &&
+               m_cap == data.m_cap &&
+               m_colour == data.m_colour &&
+               (m_style != wxSTIPPLE || m_stipple == data.m_stipple) &&
+               (m_style != wxUSER_DASH ||
+                (m_nbDash == data.m_nbDash &&
+                    memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
+    }
 
 protected:
     int           m_width;
@@ -44,6 +58,8 @@ protected:
     WXHPEN        m_hPen;
 
 private:
+    friend class WXDLLEXPORT wxPen;
+
     // Cannot use
     //  DECLARE_NO_COPY_CLASS(wxPenRefData)
     // because copy constructor is explicitly declared above;
@@ -55,41 +71,37 @@ private:
 #define M_PENDATA ((wxPenRefData *)m_refData)
 #define wxPENDATA(x) ((wxPenRefData *)(x).m_refData)
 
+// ----------------------------------------------------------------------------
 // Pen
+// ----------------------------------------------------------------------------
+
 class WXDLLEXPORT wxPen : public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxPen)
 public:
     wxPen();
     wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);
-  inline wxPen(const wxPen& pen) { Ref(pen); }
+    wxPen(const wxPen& pen) { Ref(pen); }
-  ~wxPen();
+    virtual ~wxPen();
 
-  inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
+    wxPen& operator=(const wxPen& pen)
-  inline bool operator == (const wxPen& pen) const 
     {
-      // It is impossible to know if the user dashes have changed, 
+        if ( this != &pen )
-      // so we must assume that they have
+            Ref(pen);
-      if ( m_refData && pen.m_refData )
+
+        return *this;
+    }
+
+    bool operator==(const wxPen& pen) const
     {
-          if ( M_PENDATA->m_nbDash != 0 || wxPENDATA(pen)->m_nbDash != 0 )
+        const wxPenRefData *penData = (wxPenRefData *)pen.m_refData;
-              return false;
+
-      }
+        // an invalid pen is only equal to another invalid pen
-      return m_refData == pen.m_refData;
+        return m_refData ? penData && *M_PENDATA == *penData : !penData;
-  }
-  inline bool operator != (const wxPen& pen) const 
-  { 
-      // It is impossible to know if the user dashes have changed, 
-      // so we must assume that they have
-      if ( m_refData && pen.m_refData )
-      {
-          if ( M_PENDATA->m_nbDash != 0 || wxPENDATA(pen)->m_nbDash != 0 )
-              return true;
-      }
-      return m_refData != pen.m_refData; 
     }
 
+    bool operator!=(const wxPen& pen) const { return !(*this == pen); }
+
     virtual bool Ok() const { return (m_refData != NULL); }
 
     // Override in order to recreate the pen
@@ -103,12 +115,12 @@ public:
     void SetJoin(int join);
     void SetCap(int cap);
 
-  inline wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
+    wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
-  inline int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
+    int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
-  inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
+    int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
-  inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
+    int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
-  inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
+    int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
-  inline int GetDashes(wxDash **ptr) const
+    int GetDashes(wxDash **ptr) const
     {
         *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
         return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
@@ -124,9 +136,10 @@ public:
     WXHANDLE GetResourceHandle() const;
     bool IsFree() const;
     void Unshare();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
-int wx2msPenStyle(int wx_style);
+#endif // _WX_PEN_H_
 
-#endif
-    // _WX_PEN_H_