X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46623e91bbe22b55bf8d8142be29da1e7e4867e8..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/pen.cpp?ds=inline

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index d0644b2468..8d6461dd97 100644
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -19,9 +19,8 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
-class WXDLLEXPORT wxPenRefData: public wxGDIRefData
+class WXDLLEXPORT wxPenRefData : public wxGDIRefData
 {
-    friend class WXDLLIMPEXP_FWD_CORE wxPen;
 public:
     wxPenRefData();
     wxPenRefData(const wxPenRefData& data);
@@ -33,33 +32,35 @@ public:
     {
         // 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));
+            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;
-  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;
-*/
+    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 ;
@@ -96,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;
 
@@ -111,13 +112,30 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
     RealizeResource();
 }
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& col, int Width, int 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();
+}
+#endif
+
 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 ;
@@ -126,7 +144,17 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
     RealizeResource();
 }
 
-bool wxPen::operator == (const wxPen& pen) const
+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;
 
@@ -134,39 +162,54 @@ bool wxPen::operator == (const wxPen& pen) const
     return m_refData ? penData && *M_PENDATA == *penData : !penData;
 }
 
-wxColour& wxPen::GetColour() const 
-{ 
-    return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); 
+wxColour& wxPen::GetColour() const
+{
+    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+
+    return M_PENDATA->m_colour;
 }
 
-int wxPen::GetWidth() const 
-{ 
-    return (M_PENDATA ? M_PENDATA->m_width : 0); 
+int wxPen::GetWidth() const
+{
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    return M_PENDATA->m_width;
 }
 
-int wxPen::GetStyle() const 
-{ 
-    return (M_PENDATA ? M_PENDATA->m_style : 0); 
+wxPenStyle wxPen::GetStyle() const
+{
+    wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") );
+
+    return M_PENDATA->m_style;
 }
 
-int wxPen::GetJoin() const 
-{ 
-    return (M_PENDATA ? M_PENDATA->m_join : 0); 
+wxPenJoin wxPen::GetJoin() const
+{
+    wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") );
+
+    return M_PENDATA->m_join;
 }
 
-int wxPen::GetCap() const 
-{ 
-    return (M_PENDATA ? M_PENDATA->m_cap : 0); 
+wxPenCap wxPen::GetCap() const
+{
+    wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") );
+
+    return M_PENDATA->m_cap;
 }
 
-int wxPen::GetDashes(wxDash **ptr) const 
+int wxPen::GetDashes(wxDash **ptr) const
 {
-    *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    *ptr = M_PENDATA->m_dash;
+    return M_PENDATA->m_nbDash;
 }
 
-wxBitmap *wxPen::GetStipple() const 
-{ 
-    return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); 
+wxBitmap *wxPen::GetStipple() const
+{
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
+
+    return &M_PENDATA->m_stipple;
 }
 
 void wxPen::Unshare()
@@ -211,7 +254,7 @@ void wxPen::SetWidth(int Width)
     RealizeResource();
 }
 
-void wxPen::SetStyle(int Style)
+void wxPen::SetStyle(wxPenStyle Style)
 {
     Unshare();
 
@@ -225,7 +268,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();
 }
@@ -240,7 +283,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
     RealizeResource();
 }
 
-void wxPen::SetJoin(int Join)
+void wxPen::SetJoin(wxPenJoin Join)
 {
     Unshare();
 
@@ -249,7 +292,7 @@ void wxPen::SetJoin(int Join)
     RealizeResource();
 }
 
-void wxPen::SetCap(int Cap)
+void wxPen::SetCap(wxPenCap Cap)
 {
     Unshare();