Better fix

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

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index 17c6822ac099c3fcfc0e3a8ef4a2851b5851b5ad..30aed3bbe469497301109a6e46b45d15a9467bff 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -17,16 +17,30 @@
 
 typedef long wxPMDash;
 
 
 typedef long wxPMDash;
 

-class WXDLLEXPORT wxPen;
+class WXDLLIMPEXP_FWD_CORE wxPen;

 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {

-    friend class WXDLLEXPORT wxPen;
+    friend class WXDLLIMPEXP_FWD_CORE wxPen;

 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& rData);
     virtual ~wxPenRefData();
 
 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& rData);
     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;
     int                             m_nStyle;
 protected:
     int                             m_nWidth;
     int                             m_nStyle;


@@ -44,7 +58,6 @@ protected:
 // Pen
 class WXDLLEXPORT wxPen : public wxGDIObject
 {
 // Pen
 class WXDLLEXPORT wxPen : public wxGDIObject
 {

-    DECLARE_DYNAMIC_CLASS(wxPen)

 public:
     wxPen();
     wxPen( const wxColour& rColour
 public:
     wxPen();
     wxPen( const wxColour& rColour


@@ -57,12 +70,15 @@ public:
     virtual ~wxPen();
 
     inline bool   operator == (const wxPen& rPen) const
     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;
+
+        // an invalid pen is only equal to another invalid pen
+        return m_refData ? penData && *M_PENDATA == *penData : !penData;
+    }

 
 

-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk(void) const { return (m_refData != NULL); }
+    inline bool   operator != (const wxPen& rPen) const
+        { return !(*this == rPen); }

 
     //
     // Override in order to recreate the pen
 
     //
     // Override in order to recreate the pen


@@ -105,13 +121,21 @@ public:
     //
     bool     RealizeResource(void);
     bool     FreeResource(bool bForce = false);
     //
     bool     RealizeResource(void);
     bool     FreeResource(bool bForce = false);

-    WXHANDLE GetResourceHandle(void);
+    virtual WXHANDLE GetResourceHandle(void) const;

     bool     IsFree(void) const;
     bool     IsFree(void) const;

-    void     Unshare(void);

 
 private:
     LINEBUNDLE                     m_vLineBundle;
     AREABUNDLE                     m_vAreaBundle;
 
 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);
 }; // end of CLASS wxPen
 
 extern int wx2os2PenStyle(int nWxStyle);