X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..c56ae04274fda26269c6d06be34cf59a45eb70ce:/src/os2/pen.cpp diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp index cd6504be81..712a7293ed 100644 --- a/src/os2/pen.cpp +++ b/src/os2/pen.cpp @@ -13,13 +13,12 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP -#include -#include "wx/setup.h" -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/pen.h" -#include "wx/log.h" + #include + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/pen.h" + #include "wx/log.h" #endif #include "wx/os2/private.h" @@ -33,6 +32,8 @@ wxPenRefData::wxPenRefData() m_nWidth = 1; m_nJoin = wxJOIN_ROUND ; m_nCap = wxCAP_ROUND ; + m_nbDash = 0 ; + m_dash = (wxDash*)NULL; m_hPen = 0L; } // end of wxPenRefData::wxPenRefData @@ -44,6 +45,8 @@ wxPenRefData::wxPenRefData( m_nWidth = rData.m_nWidth; m_nJoin = rData.m_nJoin; m_nCap = rData.m_nCap; + m_nbDash = rData.m_nbDash; + m_dash = rData.m_dash; m_vColour = rData.m_vColour; m_hPen = 0L; } // end of wxPenRefData::wxPenRefData @@ -353,7 +356,7 @@ void wxPen::SetColour( const wxColour& rColour ) RealizeResource(); } // end of wxPen::SetColour -void wxPen::SetColour( const unsigned char cRed, const unsigned char cGreen, const unsigned char cBlue) +void wxPen::SetColour( unsigned char cRed, unsigned char cGreen, unsigned char cBlue) { Unshare(); M_PENDATA->m_vColour.Set(cRed, cGreen, cBlue);