Add support for loading a url in the constructor to the ie backend and update the...

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

diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp
index 0dfda413c18a87a867d7c31d33506d5b261b8236..8fa09cd73f178d2204351bacbeb75b949f5cf1ec 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_style = wxPENSTYLE_SOLID;
         m_joinStyle = wxJOIN_ROUND;
         m_capStyle = wxCAP_ROUND;

-        m_dash = (wxGTKDash*) NULL;
+        m_dash = NULL;

         m_countDashes = 0;
     }
 
         m_countDashes = 0;
     }
 


@@ -106,11 +106,6 @@ wxPen::wxPen(const wxColour& colour, int width, int style)
 }
 #endif
 
 }
 #endif
 

-wxPen::~wxPen()
-{
-    // m_refData unrefed in ~wxObject
-}
-

 wxGDIRefData *wxPen::CreateGDIRefData() const
 {
     return new wxPenRefData;
 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;
 
 
     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 )
 }
 
 void wxPen::SetColour( const wxColour &colour )


@@ -180,6 +175,11 @@ void wxPen::SetWidth( int width )
     M_PENDATA->m_width = 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") );
 int wxPen::GetDashes( wxDash **ptr ) const
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );


@@ -204,21 +204,21 @@ wxDash* wxPen::GetDash() const
 
 wxPenCap wxPen::GetCap() const
 {
 
 wxPenCap wxPen::GetCap() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_capStyle;
 }
 
 wxPenJoin wxPen::GetJoin() const
 {
 
     return M_PENDATA->m_capStyle;
 }
 
 wxPenJoin wxPen::GetJoin() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_joinStyle;
 }
 
 wxPenStyle wxPen::GetStyle() const
 {
 
     return M_PENDATA->m_joinStyle;
 }
 
 wxPenStyle wxPen::GetStyle() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_style;
 }
 
     return M_PENDATA->m_style;
 }


@@ -230,9 +230,15 @@ int wxPen::GetWidth() const
     return M_PENDATA->m_width;
 }
 
     return M_PENDATA->m_width;
 }
 

-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const

 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 
     return M_PENDATA->m_colour;
 }
 {
     wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
 
     return M_PENDATA->m_colour;
 }

+
+wxBitmap *wxPen::GetStipple() const
+{
+    return NULL;
+}
+