pen.h depends from brush.h in compat mode

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

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index 2502b392fb674055cd560cb4061ea3757a91bb11..fac1abae2711e7477fb241047ecc128bfa9f4888 100644 (file)
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -1,24 +1,63 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.cpp
+// Name:        src/mac/carbon/pen.cpp

 // Purpose:     wxPen
 // Purpose:     wxPen

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "pen.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/setup.h"
-#include "wx/utils.h"

 #include "wx/pen.h"
 
 #include "wx/pen.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 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;
+    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;
 wxPenRefData::wxPenRefData()
 {
     m_style = wxSOLID;


@@ -27,12 +66,10 @@ wxPenRefData::wxPenRefData()
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;
     m_dash = 0 ;
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;
     m_dash = 0 ;

-/* TODO: null data
-    m_hPen = 0;
-*/

 }
 
 wxPenRefData::wxPenRefData(const wxPenRefData& data)
 }
 
 wxPenRefData::wxPenRefData(const wxPenRefData& data)

+: wxGDIRefData()

 {
     m_style = data.m_style;
     m_width = data.m_width;
 {
     m_style = data.m_style;
     m_width = data.m_width;


@@ -41,32 +78,26 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data)
     m_nbDash = data.m_nbDash;
     m_dash = data.m_dash;
     m_colour = data.m_colour;
     m_nbDash = data.m_nbDash;
     m_dash = data.m_dash;
     m_colour = data.m_colour;

-/* TODO: null data
-    m_hPen = 0;
-*/

 }
 
 wxPenRefData::~wxPenRefData()
 {
 }
 
 wxPenRefData::~wxPenRefData()
 {

-    // TODO: delete data

 }
 
 // Pens
 
 }
 
 // Pens
 

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

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

-    if ( wxThePenList )
-        wxThePenList->AddPen(this);

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

-    if (wxThePenList)
-        wxThePenList->RemovePen(this);

 }
 
 // Should implement Create
 }
 
 // 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;
 
 {
     m_refData = new wxPenRefData;
 


@@ -79,9 +110,21 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
     M_PENDATA->m_dash = 0 ;
 
     RealizeResource();
     M_PENDATA->m_dash = 0 ;
 
     RealizeResource();

+}

 
 

-    if ( wxThePenList )
-        wxThePenList->AddPen(this);
+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)
 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)


@@ -97,24 +140,74 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
     M_PENDATA->m_dash = 0 ;
 
     RealizeResource();
     M_PENDATA->m_dash = 0 ;
 
     RealizeResource();

+}

 
 

-    if ( wxThePenList )
-        wxThePenList->AddPen(this);
+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 : 0);
+}
+
+wxPenJoin wxPen::GetJoin() const
+{
+    return (M_PENDATA ? M_PENDATA->m_join : 0);
+}
+
+wxPenCap 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()
 {
 }
 
 void wxPen::Unshare()
 {

-       // Don't change shared data
-       if (!m_refData)
+    // Don't change shared data
+    if (!m_refData)

     {
     {

-               m_refData = new wxPenRefData();
-       }
+        m_refData = new wxPenRefData();
+    }

     else
     {
     else
     {

-               wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
-               UnRef();
-               m_refData = ref;
-       }
+        wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }

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


@@ -122,7 +215,7 @@ void wxPen::SetColour(const wxColour& col)
     Unshare();
 
     M_PENDATA->m_colour = col;
     Unshare();
 
     M_PENDATA->m_colour = col;

-  
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -131,7 +224,7 @@ void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
     Unshare();
 
     M_PENDATA->m_colour.Set(r, g, b);
     Unshare();
 
     M_PENDATA->m_colour.Set(r, g, b);

-  
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -144,7 +237,7 @@ void wxPen::SetWidth(int Width)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxPen::SetStyle(int Style)
+void wxPen::SetStyle(wxPenStyle Style)

 {
     Unshare();
 
 {
     Unshare();
 


@@ -159,7 +252,7 @@ void wxPen::SetStipple(const wxBitmap& Stipple)
 
     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;
 
     M_PENDATA->m_stipple = Stipple;
     M_PENDATA->m_style = wxSTIPPLE;

-  
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -169,11 +262,11 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 
     M_PENDATA->m_nbDash = nb_dashes;
     M_PENDATA->m_dash = (wxDash *)Dash;
 
     M_PENDATA->m_nbDash = nb_dashes;
     M_PENDATA->m_dash = (wxDash *)Dash;

-  
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxPen::SetJoin(int Join)
+void wxPen::SetJoin(wxPenJoin Join)

 {
     Unshare();
 
 {
     Unshare();
 


@@ -182,7 +275,7 @@ void wxPen::SetJoin(int Join)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxPen::SetCap(int Cap)
+void wxPen::SetCap(wxPenCap Cap)

 {
     Unshare();
 
 {
     Unshare();
 


@@ -193,8 +286,6 @@ void wxPen::SetCap(int Cap)
 
 bool wxPen::RealizeResource()
 {
 
 bool wxPen::RealizeResource()
 {

-    // TODO: create actual pen
-    return FALSE;
+    // nothing to do here for mac
+    return true;

 }
 }

-
-