escape underscores and don't use abbreviations in text

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

diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp
index b5e0cae9095d0351f4f86f3479cecece747bba10..6fc6a57176da94c0b97c7faa05c3c9f4b1279635 100644 (file)
--- a/src/x11/pen.cpp
+++ b/src/x11/pen.cpp
@@ -9,7 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/setup.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/utils.h"
 #include "wx/pen.h"
 #include "wx/colour.h"
@@ -31,7 +33,7 @@ public:
         m_dash = (wxX11Dash*) NULL;
         m_countDashes = 0;
     }
-    
+
     wxPenRefData( const wxPenRefData& data )
     {
         m_style = data.m_style;
@@ -56,7 +58,7 @@ public:
                 m_capStyle == data.m_capStyle &&
                 m_colour == data.m_colour);
     }
-            
+
     int        m_width;
     int        m_style;
     int        m_joinStyle;
@@ -98,24 +100,24 @@ 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
 }
@@ -123,42 +125,42 @@ void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
 void wxPen::SetColour( int red, int green, int 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;
 }