X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..7c08b47173a8dfcdc8af7349bd708c9b84b1d636:/src/mac/carbon/pen.cpp

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index be3a7a405a..b1e1cccb01 100644
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -11,14 +11,56 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/utils.h"
 #include "wx/pen.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
+class WXDLLEXPORT wxPenRefData : public wxGDIRefData
+{
+public:
+    wxPenRefData();
+    wxPenRefData(const wxPenRefData& data);
+    virtual ~wxPenRefData();
+
+    wxPenRefData& operator=(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 &&
+            m_join == data.m_join &&
+            m_cap == data.m_cap &&
+            m_colour == data.m_colour &&
+            (m_style != wxPENSTYLE_STIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&
+            (m_style != wxPENSTYLE_USER_DASH ||
+             (m_nbDash == data.m_nbDash &&
+              memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
+    }
+
+protected:
+    int           m_width;
+    wxPenStyle    m_style;
+    wxPenJoin     m_join ;
+    wxPenCap      m_cap ;
+    wxBitmap      m_stipple ;
+    int           m_nbDash ;
+    wxDash *      m_dash ;
+    wxColour      m_colour;
+    /* TODO: implementation
+       WXHPEN        m_hPen;
+       */
+
+    friend class WXDLLIMPEXP_FWD_CORE wxPen;
+};
+
 wxPenRefData::wxPenRefData()
 {
-    m_style = wxSOLID;
+    m_style = wxPENSTYLE_SOLID;
     m_width = 1;
     m_join = wxJOIN_ROUND ;
     m_cap = wxCAP_ROUND ;
@@ -44,6 +86,8 @@ wxPenRefData::~wxPenRefData()
 
 // Pens
 
+#define M_PENDATA ((wxPenRefData *)m_refData)
+
 wxPen::wxPen()
 {
 }
@@ -53,7 +97,7 @@ wxPen::~wxPen()
 }
 
 // Should implement Create
-wxPen::wxPen(const wxColour& col, int Width, int Style)
+wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style)
 {
     m_refData = new wxPenRefData;
 
@@ -68,13 +112,28 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
     RealizeResource();
 }
 
+wxPen::wxPen(const wxColour& col, int Width, wxBrushStyle Style)
+{
+    m_refData = new wxPenRefData;
+
+    M_PENDATA->m_colour = col;
+    M_PENDATA->m_width = Width;
+    M_PENDATA->m_style = (wxPenStyle)Style;
+    M_PENDATA->m_join = wxJOIN_ROUND ;
+    M_PENDATA->m_cap = wxCAP_ROUND ;
+    M_PENDATA->m_nbDash = 0 ;
+    M_PENDATA->m_dash = 0 ;
+
+    RealizeResource();
+}
+
 wxPen::wxPen(const wxBitmap& stipple, int Width)
 {
     m_refData = new wxPenRefData;
 
     M_PENDATA->m_stipple = stipple;
     M_PENDATA->m_width = Width;
-    M_PENDATA->m_style = wxSTIPPLE;
+    M_PENDATA->m_style = wxPENSTYLE_STIPPLE;
     M_PENDATA->m_join = wxJOIN_ROUND ;
     M_PENDATA->m_cap = wxCAP_ROUND ;
     M_PENDATA->m_nbDash = 0 ;
@@ -83,6 +142,59 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
     RealizeResource();
 }
 
+wxGDIRefData *wxPen::CreateGDIRefData() const
+{
+    return new wxPenRefData;
+}
+
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxPenRefData(*wx_static_cast(const wxPenRefData *, data));
+}
+
+bool wxPen::operator==(const wxPen& pen) const
+{
+    const wxPenRefData *penData = (wxPenRefData *)pen.m_refData;
+
+    // an invalid pen is only equal to another invalid pen
+    return m_refData ? penData && *M_PENDATA == *penData : !penData;
+}
+
+wxColour& wxPen::GetColour() const
+{
+    return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour);
+}
+
+int wxPen::GetWidth() const
+{
+    return (M_PENDATA ? M_PENDATA->m_width : 0);
+}
+
+wxPenStyle wxPen::GetStyle() const
+{
+    return (M_PENDATA ? M_PENDATA->m_style : wxPENSTYLE_SOLID);
+}
+
+wxPenJoin wxPen::GetJoin() const
+{
+    return (M_PENDATA ? M_PENDATA->m_join : wxJOIN_INVALID);
+}
+
+wxPenCap wxPen::GetCap() const
+{
+    return (M_PENDATA ? M_PENDATA->m_cap : wxCAP_INVALID);
+}
+
+int wxPen::GetDashes(wxDash **ptr) const
+{
+    *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
+}
+
+wxBitmap *wxPen::GetStipple() const
+{
+    return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL);
+}
+
 void wxPen::Unshare()
 {
     // Don't change shared data
@@ -107,7 +219,7 @@ void wxPen::SetColour(const wxColour& col)
     RealizeResource();
 }
 
-void wxPen::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();
 
@@ -125,7 +237,7 @@ void wxPen::SetWidth(int Width)
     RealizeResource();
 }
 
-void wxPen::SetStyle(int Style)
+void wxPen::SetStyle(wxPenStyle Style)
 {
     Unshare();
 
@@ -139,7 +251,7 @@ void wxPen::SetStipple(const wxBitmap& Stipple)
     Unshare();
 
     M_PENDATA->m_stipple = Stipple;
-    M_PENDATA->m_style = wxSTIPPLE;
+    M_PENDATA->m_style = wxPENSTYLE_STIPPLE;
 
     RealizeResource();
 }
@@ -154,7 +266,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
     RealizeResource();
 }
 
-void wxPen::SetJoin(int Join)
+void wxPen::SetJoin(wxPenJoin Join)
 {
     Unshare();
 
@@ -163,7 +275,7 @@ void wxPen::SetJoin(int Join)
     RealizeResource();
 }
 
-void wxPen::SetCap(int Cap)
+void wxPen::SetCap(wxPenCap Cap)
 {
     Unshare();