missing commit

[wxWidgets.git] / src / gtk1 / pen.cpp

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index 0dfda413c18a87a867d7c31d33506d5b261b8236..64484abbee5d6120621f1d5d716a922a3bb61465 100644 (file)
--- a/src/gtk1/pen.cpp
+++ b/src/gtk1/pen.cpp
@@ -31,7 +31,7 @@ public:
         m_style = wxPENSTYLE_SOLID;
         m_joinStyle = wxJOIN_ROUND;
         m_capStyle = wxCAP_ROUND;
-        m_dash = (wxGTKDash*) NULL;
+        m_dash = NULL;
         m_countDashes = 0;
     }
 
@@ -106,11 +106,6 @@ wxPen::wxPen(const wxColour& colour, int width, int style)
 }
 #endif
 
-wxPen::~wxPen()
-{
-    // m_refData unrefed in ~wxObject
-}
-
 wxGDIRefData *wxPen::CreateGDIRefData() const
 {
     return new wxPenRefData;
@@ -127,7 +122,7 @@ bool wxPen::operator == ( const wxPen& pen ) const
 
     if (!m_refData || !pen.m_refData) return false;
 
-    return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
+    return *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData;
 }
 
 void wxPen::SetColour( const wxColour &colour )
@@ -180,9 +175,14 @@ void wxPen::SetWidth( int width )
     M_PENDATA->m_width = width;
 }
 
+void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple))
+{
+    wxFAIL_MSG( "stippled pens not supported" );
+}
+
 int wxPen::GetDashes( wxDash **ptr ) const
 {
-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
 
     *ptr = (wxDash*)M_PENDATA->m_dash;
     return M_PENDATA->m_countDashes;
@@ -190,49 +190,55 @@ int wxPen::GetDashes( wxDash **ptr ) const
 
 int wxPen::GetDashCount() const
 {
-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
 
     return (M_PENDATA->m_countDashes);
 }
 
 wxDash* wxPen::GetDash() const
 {
-    wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
 
     return (wxDash*)M_PENDATA->m_dash;
 }
 
 wxPenCap wxPen::GetCap() const
 {
-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") );
 
     return M_PENDATA->m_capStyle;
 }
 
 wxPenJoin wxPen::GetJoin() const
 {
-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") );
 
     return M_PENDATA->m_joinStyle;
 }
 
 wxPenStyle wxPen::GetStyle() const
 {
-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") );
 
     return M_PENDATA->m_style;
 }
 
 int wxPen::GetWidth() const
 {
-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
 
     return M_PENDATA->m_width;
 }
 
-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const
 {
-    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") );
 
     return M_PENDATA->m_colour;
 }
+
+wxBitmap *wxPen::GetStipple() const
+{
+    return NULL;
+}
+