X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fd2b2c6ae663c7840f53e4cf087525602eaca7b..5adad46628e545a6d4172ecf3a0cb848934f5cd0:/src/os2/dc.cpp diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp index 883aa74a06..7ac6173a99 100644 --- a/src/os2/dc.cpp +++ b/src/os2/dc.cpp @@ -155,6 +155,8 @@ int SetBkMode( wxDC::wxDC(void) { + wxColour vColor; + m_pCanvas = NULL; m_hOldBitmap = 0; @@ -168,7 +170,11 @@ wxDC::wxDC(void) m_hOldPS = NULL; m_hPS = NULL; m_bIsPaintTime = FALSE; // True at Paint Time - m_brush.GetColour().Set("WHITE"); + + vColor.InitFromName("BLACK"); + m_pen.SetColour(vColor); + vColor.Set("WHITE"); + m_brush.SetColour(vColor); } // end of wxDC::wxDC wxDC::~wxDC(void) @@ -815,8 +821,8 @@ void wxDC::DoDrawRectangle( ); vPoint[0].x = vX + 1; vPoint[0].y = vY + 1; - vPoint[1].x = vX + vWidth - 2; - vPoint[1].y = vY + vHeight + 2; + vPoint[1].x = vX + vWidth - 1; + vPoint[1].y = vY + vHeight - 1; ::GpiMove(m_hPS, &vPoint[0]); ::GpiBox( m_hPS ,lControl