wxXmlNode::GetAttribute's pointer argument must not be NULL, check for it

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

diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp
index 339ef203f524fdcd84a3bf0ba517e18f41c88a51..23cf2ca01e3f0439131e304a67753e8669f422ea 100644 (file)
--- a/src/x11/pen.cpp
+++ b/src/x11/pen.cpp
@@ -9,14 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "pen.h"
-#endif
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
-#include "wx/setup.h"
-#include "wx/utils.h"
 #include "wx/pen.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+#endif
+
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------
@@ -33,7 +36,7 @@ public:
         m_dash = (wxX11Dash*) NULL;
         m_countDashes = 0;
     }
-    
+
     wxPenRefData( const wxPenRefData& data )
     {
         m_style = data.m_style;
@@ -47,6 +50,7 @@ public:
             m_dash = new
 */
         m_dash = data.m_dash;
+        m_stipple = data.m_stipple;
     }
 
     bool operator == (const wxPenRefData& data) const
@@ -57,13 +61,14 @@ public:
                 m_capStyle == data.m_capStyle &&
                 m_colour == data.m_colour);
     }
-            
+
     int        m_width;
     int        m_style;
     int        m_joinStyle;
     int        m_capStyle;
     wxColour   m_colour;
     int        m_countDashes;
+    wxBitmap   m_stipple;
     wxX11Dash *m_dash;
 };
 
@@ -98,60 +103,67 @@ wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
 
 bool wxPen::operator == ( const wxPen& pen ) const
 {
-    if (m_refData == pen.m_refData) return TRUE;
-    
-    if (!m_refData || !pen.m_refData) return FALSE;
-    
+    if (m_refData == pen.m_refData) return true;
+
+    if (!m_refData || !pen.m_refData) return false;
+
     return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
 }
 
 void wxPen::SetColour( const wxColour &colour )
 {
     AllocExclusive();
-    
+
     M_PENDATA->m_colour = colour;
 }
 
 void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
 {
     AllocExclusive();
-    
+
     M_PENDATA->m_countDashes = number_of_dashes;
     M_PENDATA->m_dash = (wxX11Dash *)dash; // TODO
 }
 
-void wxPen::SetColour( int red, int green, int blue )
+void wxPen::SetColour( unsigned char red, unsigned char green, unsigned char blue )
 {
     AllocExclusive();
-    
+
     M_PENDATA->m_colour.Set( red, green, blue );
 }
 
 void wxPen::SetCap( int capStyle )
 {
     AllocExclusive();
-    
+
     M_PENDATA->m_capStyle = capStyle;
 }
 
 void wxPen::SetJoin( int joinStyle )
 {
     AllocExclusive();
-    
+
     M_PENDATA->m_joinStyle = joinStyle;
 }
 
+void wxPen::SetStipple( wxBitmap *stipple )
+{
+    AllocExclusive();
+
+    M_PENDATA->m_stipple = *stipple;
+}
+
 void wxPen::SetStyle( int style )
 {
     AllocExclusive();
-    
+
     M_PENDATA->m_style = style;
 }
 
 void wxPen::SetWidth( int width )
 {
     AllocExclusive();
-    
+
     M_PENDATA->m_width = width;
 }
 
@@ -205,3 +217,10 @@ wxColour &wxPen::GetColour() const
 
     return M_PENDATA->m_colour;
 }
+
+wxBitmap *wxPen::GetStipple() const
+{
+    wxCHECK_MSG( Ok(), &wxNullBitmap, wxT("invalid pen") );
+
+    return &M_PENDATA->m_stipple;
+}