fix compilation after r50329

[wxWidgets.git] / src / mac / carbon / pen.cpp

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index 9812f009aa85d2d7836cdff60ecef09e2471fd71..5fa47f2a9a1c776435803d7fffc2688e8032312f 100644 (file)
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -19,6 +19,45 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 
 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 != wxSTIPPLE || m_stipple.IsSameAs(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;
+    int           m_style;
+    int           m_join ;
+    int           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;
 wxPenRefData::wxPenRefData()
 {
     m_style = wxSOLID;


@@ -47,6 +86,8 @@ wxPenRefData::~wxPenRefData()
 
 // Pens
 
 
 // Pens
 

+#define M_PENDATA ((wxPenRefData *)m_refData)
+

 wxPen::wxPen()
 {
 }
 wxPen::wxPen()
 {
 }


@@ -86,19 +127,77 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-wxObjectRefData* wxPen::CreateRefData() const
+wxGDIRefData *wxPen::CreateGDIRefData() const

 {
     return new wxPenRefData;
 }
 
 {
     return new wxPenRefData;
 }
 

-wxObjectRefData* wxPen::CloneRefData(const wxObjectRefData* data) const
+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);
+}
+
+int wxPen::GetStyle() const
+{
+    return (M_PENDATA ? M_PENDATA->m_style : 0);
+}
+
+int wxPen::GetJoin() const
+{
+    return (M_PENDATA ? M_PENDATA->m_join : 0);
+}
+
+int wxPen::GetCap() const
+{
+    return (M_PENDATA ? M_PENDATA->m_cap : 0);
+}
+
+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()

 {
 {

-    return new wxPenRefData(*wx_static_cast(const wxPenRefData*, data));
+    // Don't change shared data
+    if (!m_refData)
+    {
+        m_refData = new wxPenRefData();
+    }
+    else
+    {
+        wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }

 }
 
 void wxPen::SetColour(const wxColour& col)
 {
 }
 
 void wxPen::SetColour(const wxColour& col)
 {

-    AllocExclusive();
+    Unshare();

 
     M_PENDATA->m_colour = col;
 
 
     M_PENDATA->m_colour = col;
 


@@ -107,7 +206,7 @@ void wxPen::SetColour(const wxColour& col)
 
 void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
 
 void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {

-    AllocExclusive();
+    Unshare();

 
     M_PENDATA->m_colour.Set(r, g, b);
 
 
     M_PENDATA->m_colour.Set(r, g, b);
 


@@ -116,7 +215,7 @@ void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
 
 void wxPen::SetWidth(int Width)
 {
 
 void wxPen::SetWidth(int Width)
 {

-    AllocExclusive();
+    Unshare();

 
     M_PENDATA->m_width = Width;
 
 
     M_PENDATA->m_width = Width;
 


@@ -125,7 +224,7 @@ void wxPen::SetWidth(int Width)
 
 void wxPen::SetStyle(int Style)
 {
 
 void wxPen::SetStyle(int Style)
 {

-    AllocExclusive();
+    Unshare();

 
     M_PENDATA->m_style = Style;
 
 
     M_PENDATA->m_style = Style;
 


@@ -134,7 +233,7 @@ void wxPen::SetStyle(int Style)
 
 void wxPen::SetStipple(const wxBitmap& Stipple)
 {
 
 void wxPen::SetStipple(const wxBitmap& Stipple)
 {

-    AllocExclusive();
+    Unshare();

 
     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;
 
     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;


@@ -144,7 +243,7 @@ void wxPen::SetStipple(const wxBitmap& Stipple)
 
 void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {
 
 void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {

-    AllocExclusive();
+    Unshare();

 
     M_PENDATA->m_nbDash = nb_dashes;
     M_PENDATA->m_dash = (wxDash *)Dash;
 
     M_PENDATA->m_nbDash = nb_dashes;
     M_PENDATA->m_dash = (wxDash *)Dash;


@@ -154,7 +253,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 
 void wxPen::SetJoin(int Join)
 {
 
 void wxPen::SetJoin(int Join)
 {

-    AllocExclusive();
+    Unshare();

 
     M_PENDATA->m_join = Join;
 
 
     M_PENDATA->m_join = Join;
 


@@ -163,7 +262,7 @@ void wxPen::SetJoin(int Join)
 
 void wxPen::SetCap(int Cap)
 {
 
 void wxPen::SetCap(int Cap)
 {

-    AllocExclusive();
+    Unshare();

 
     M_PENDATA->m_cap = Cap;
 
 
     M_PENDATA->m_cap = Cap;