X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..b8e3f1cfb7892a1144385bbbd94e9d4f02d887d5:/src/gtk/pen.cpp diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp index 721b850a9f..498f38025d 100644 --- a/src/gtk/pen.cpp +++ b/src/gtk/pen.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: pen.cpp +// Name: src/gtk/pen.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,7 +11,10 @@ #include "wx/wxprec.h" #include "wx/pen.h" -#include "wx/colour.h" + +#ifndef WX_PRECOMP + #include "wx/colour.h" +#endif #include @@ -31,7 +34,7 @@ public: m_dash = (wxGTKDash*) NULL; m_countDashes = 0; } - + wxPenRefData( const wxPenRefData& data ) : wxObjectRefData() { @@ -47,19 +50,19 @@ public: bool operator == (const wxPenRefData& data) const { if ( m_countDashes != data.m_countDashes ) - return FALSE; + return false; if ( m_dash ) { if ( !data.m_dash || memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxGTKDash)) ) { - return FALSE; + return false; } } else if ( data.m_dash ) { - return FALSE; + return false; } @@ -69,7 +72,7 @@ public: m_capStyle == data.m_capStyle && m_colour == data.m_colour; } - + int m_width; int m_style; int m_joinStyle; @@ -110,60 +113,60 @@ 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 = (wxGTKDash *)dash; } -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::SetStyle( int style ) { AllocExclusive(); - + M_PENDATA->m_style = style; } void wxPen::SetWidth( int width ) { AllocExclusive(); - + M_PENDATA->m_width = width; } @@ -217,4 +220,3 @@ wxColour &wxPen::GetColour() const return M_PENDATA->m_colour; } -