Better fix

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

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index 0d122947997c8b068f71eff6e2f74f5d90bbb4b2..30aed3bbe469497301109a6e46b45d15a9467bff 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -17,15 +17,29 @@
 
 typedef long wxPMDash;
 
-class WXDLLEXPORT wxPen;
+class WXDLLIMPEXP_FWD_CORE wxPen;
 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {
-    friend class WXDLLEXPORT wxPen;
+    friend class WXDLLIMPEXP_FWD_CORE wxPen;
 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& rData);
-    ~wxPenRefData();
+    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;
@@ -33,6 +47,8 @@ protected:
     int                             m_nJoin;
     int                             m_nCap;
     wxBitmap                        m_vStipple;
+    int                             m_nbDash;
+    wxDash *                        m_dash;
     wxColour                        m_vColour;
     WXHPEN                          m_hPen;// in OS/2 GPI this will be the PS the pen is associated with
 };
@@ -42,7 +58,6 @@ protected:
 // Pen
 class WXDLLEXPORT wxPen : public wxGDIObject
 {
-    DECLARE_DYNAMIC_CLASS(wxPen)
 public:
     wxPen();
     wxPen( const wxColour& rColour
@@ -52,14 +67,18 @@ public:
     wxPen( const wxBitmap& rStipple
           ,int             nWidth
          );
-    ~wxPen();
+    virtual ~wxPen();
 
     inline bool   operator == (const wxPen& rPen) const
-        { return m_refData == rPen.m_refData; }
-    inline bool   operator != (const wxPen& rPen) const
-        { return m_refData != rPen.m_refData; }
+    {
+        const wxPenRefData *penData = (wxPenRefData *)rPen.m_refData;
 
-    virtual bool Ok(void) const { return (m_refData != NULL); }
+        // 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 !(*this == rPen); }
 
     //
     // Override in order to recreate the pen
@@ -83,10 +102,13 @@ public:
     inline int       GetJoin(void) const { return (M_PENDATA ? M_PENDATA->m_nJoin : 0); };
     inline int       GetCap(void) const { return (M_PENDATA ? M_PENDATA->m_nCap : 0); };
     inline int       GetPS(void) const { return (M_PENDATA ? M_PENDATA->m_hPen : 0); };
-
-    int GetDashes(wxDash **ptr) const;
-    int GetDashCount() const;
-    wxDash* GetDash() const;
+    inline int       GetDashes(wxDash **ptr) const
+    {
+        *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
+        return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
+    }
+    inline wxDash*   GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); };
+    inline int       GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); };
 
     inline wxBitmap* GetStipple(void) const { return (M_PENDATA ? (& M_PENDATA->m_vStipple) : (wxBitmap*) NULL); };
 
@@ -99,13 +121,21 @@ public:
     //
     bool     RealizeResource(void);
     bool     FreeResource(bool bForce = false);
-    WXHANDLE GetResourceHandle(void);
+    virtual WXHANDLE GetResourceHandle(void) const;
     bool     IsFree(void) const;
-    void     Unshare(void);
 
 private:
     LINEBUNDLE                     m_vLineBundle;
     AREABUNDLE                     m_vAreaBundle;
+
+protected:
+    virtual wxGDIRefData* CreateGDIRefData() const;
+    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
+
+    // same as FreeResource() + RealizeResource()
+    bool Recreate();
+
+    DECLARE_DYNAMIC_CLASS(wxPen)
 }; // end of CLASS wxPen
 
 extern int wx2os2PenStyle(int nWxStyle);