splitted wxApp docs in wxApp+wxAppConsole docs; fix the signature of the documented...

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

diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp
index fac1abae2711e7477fb241047ecc128bfa9f4888..8d6461dd9746fcf3b0bb3f81aff42af7e6068164 100644 (file)
--- a/src/mac/carbon/pen.cpp
+++ b/src/mac/carbon/pen.cpp
@@ -36,8 +36,8 @@ public:
             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_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));
     }
@@ -60,7 +60,7 @@ protected:
 
 wxPenRefData::wxPenRefData()
 {
-    m_style = wxSOLID;
+    m_style = wxPENSTYLE_SOLID;
     m_width = 1;
     m_join = wxJOIN_ROUND ;
     m_cap = wxCAP_ROUND ;
@@ -112,7 +112,8 @@ wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style)
     RealizeResource();
 }
 
-wxPen::wxPen(const wxColour& col, int Width, wxBrushStyle Style)
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& col, int Width, int Style)
 {
     m_refData = new wxPenRefData;
 
@@ -126,6 +127,7 @@ wxPen::wxPen(const wxColour& col, int Width, wxBrushStyle Style)
 
     RealizeResource();
 }
+#endif
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)
 {
@@ -133,7 +135,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
 
     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 ;
@@ -162,37 +164,52 @@ bool wxPen::operator==(const wxPen& pen) const
 
 wxColour& wxPen::GetColour() const
 {
-    return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour);
+    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+
+    return M_PENDATA->m_colour;
 }
 
 int wxPen::GetWidth() const
 {
-    return (M_PENDATA ? M_PENDATA->m_width : 0);
+    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+    return M_PENDATA->m_width;
 }
 
 wxPenStyle wxPen::GetStyle() const
 {
-    return (M_PENDATA ? M_PENDATA->m_style : 0);
+    wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") );
+
+    return M_PENDATA->m_style;
 }
 
 wxPenJoin wxPen::GetJoin() const
 {
-    return (M_PENDATA ? M_PENDATA->m_join : 0);
+    wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") );
+
+    return M_PENDATA->m_join;
 }
 
 wxPenCap wxPen::GetCap() const
 {
-    return (M_PENDATA ? M_PENDATA->m_cap : 0);
+    wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") );
+
+    return M_PENDATA->m_cap;
 }
 
 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);
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
+
+    return &M_PENDATA->m_stipple;
 }
 
 void wxPen::Unshare()
@@ -251,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();
 }