X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e87870780586104029acf7b5dd28e26260bdb0f..c89e16e423b150b99376691543e727e0f2d7bdbe:/src/os2/pen.cpp diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp index 712a7293ed..24d89e39b2 100644 --- a/src/os2/pen.cpp +++ b/src/os2/pen.cpp @@ -12,12 +12,13 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/pen.h" + #ifndef WX_PRECOMP #include #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" - #include "wx/pen.h" #include "wx/log.h" #endif @@ -60,14 +61,10 @@ wxPenRefData::~wxPenRefData() // wxPen::wxPen() { - if ( wxThePenList ) - wxThePenList->AddPen(this); } // end of wxPen::wxPen wxPen::~wxPen() { - if (wxThePenList) - wxThePenList->RemovePen(this); } // end of wxPen::wxPen // Should implement Create @@ -87,9 +84,6 @@ wxPen::wxPen( M_PENDATA->m_hPen = 0L; RealizeResource(); - - if ( wxThePenList ) - wxThePenList->AddPen(this); } // end of wxPen::wxPen wxPen::wxPen( @@ -107,9 +101,6 @@ wxPen::wxPen( M_PENDATA->m_hPen = 0; RealizeResource(); - - if ( wxThePenList ) - wxThePenList->AddPen(this); } // end of wxPen::wxPen int wx2os2PenStyle( @@ -202,6 +193,8 @@ bool wxPen::RealizeResource() } m_vLineBundle.lColor = (LONG)vPmColour; m_vLineBundle.usMixMode = FM_OVERPAINT; + if (M_PENDATA->m_nWidth < 1) + M_PENDATA->m_nWidth = 1; m_vLineBundle.fxWidth = M_PENDATA->m_nWidth; m_vLineBundle.lGeomWidth = M_PENDATA->m_nWidth; m_vLineBundle.usType = uLineType; @@ -311,7 +304,7 @@ bool wxPen::RealizeResource() return false; } // end of wxPen::RealizeResource -WXHANDLE wxPen::GetResourceHandle() +WXHANDLE wxPen::GetResourceHandle() const { if (!M_PENDATA) return 0;