Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed OS/2 compilation after wxDC changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2008-01-19 21:15:03 +00:00
parent ad8dd67e02
commit 38400bb46b
7 changed files with 100 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/os2/bmpbuttn.cpp
View File

@@ -19,6 +19,7 @@
#ifndef WX_PRECOMP
#endif
#include "wx/os2/dcclient.h"
#include "wx/os2/private.h"
@@ -129,8 +130,9 @@ bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem)
//
int nX1 = 0;
int nY1 = 0;
int nWidth = vDc.m_vRclPaint.xRight - vDc.m_vRclPaint.xLeft;
int nHeight = vDc.m_vRclPaint.yTop - vDc.m_vRclPaint.yBottom;
wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
int nWidth = impl->m_vRclPaint.xRight - impl->m_vRclPaint.xLeft;
int nHeight = impl->m_vRclPaint.yTop - impl->m_vRclPaint.yBottom;
int nBmpWidth = pBitmap->GetWidth();
int nBmpHeight = pBitmap->GetHeight();
@@ -189,31 +191,32 @@ void wxBitmapButton::DrawFace (wxClientDC& rDC, bool bSel)
// Note: DrawLine expects wxWidgets coordinate system so swap
//
rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen);
wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl();
// top
rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
,rDC.m_vRclPaint.yBottom + 1
,rDC.m_vRclPaint.xRight - 1
,rDC.m_vRclPaint.yBottom + 1
rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
,impl->m_vRclPaint.yBottom + 1
,impl->m_vRclPaint.xRight - 1
,impl->m_vRclPaint.yBottom + 1
);
// left
rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
,rDC.m_vRclPaint.yBottom + 1
,rDC.m_vRclPaint.xLeft + 1
,rDC.m_vRclPaint.yTop - 1
rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
,impl->m_vRclPaint.yBottom + 1
,impl->m_vRclPaint.xLeft + 1
,impl->m_vRclPaint.yTop - 1
);
rDC.SetPen(bSel ? vHiLitePen : vDarkShadowPen);
// bottom
rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
,rDC.m_vRclPaint.yTop - 1
,rDC.m_vRclPaint.xRight - 1
,rDC.m_vRclPaint.yTop - 1
rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
,impl->m_vRclPaint.yTop - 1
,impl->m_vRclPaint.xRight - 1
,impl->m_vRclPaint.yTop - 1
);
// right
rDC.DrawLine( rDC.m_vRclPaint.xRight - 1
,rDC.m_vRclPaint.yBottom + 1
,rDC.m_vRclPaint.xRight - 1
,rDC.m_vRclPaint.yTop - 1
rDC.DrawLine( impl->m_vRclPaint.xRight - 1
,impl->m_vRclPaint.yBottom + 1
,impl->m_vRclPaint.xRight - 1
,impl->m_vRclPaint.yTop - 1
);
} // end of wxBitmapButton::DrawFace
@@ -229,29 +232,30 @@ void wxBitmapButton::DrawButtonFocus (
// Note: DrawLine expects wxWidgets coordinate system so swap
//
rDC.SetPen(vBlackPen);
wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl();
// top
rDC.DrawLine( rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yBottom
,rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yBottom
rDC.DrawLine( impl->m_vRclPaint.xLeft
,impl->m_vRclPaint.yBottom
,impl->m_vRclPaint.xRight
,impl->m_vRclPaint.yBottom
);
// right
rDC.DrawLine( rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yBottom
,rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yTop
rDC.DrawLine( impl->m_vRclPaint.xRight
,impl->m_vRclPaint.yBottom
,impl->m_vRclPaint.xRight
,impl->m_vRclPaint.yTop
);
// bottom
rDC.DrawLine( rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yTop
,rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yTop
rDC.DrawLine( impl->m_vRclPaint.xRight
,impl->m_vRclPaint.yTop
,impl->m_vRclPaint.xLeft
,impl->m_vRclPaint.yTop
);
// left
rDC.DrawLine( rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yTop
,rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yBottom
rDC.DrawLine( impl->m_vRclPaint.xLeft
,impl->m_vRclPaint.yTop
,impl->m_vRclPaint.xLeft
,impl->m_vRclPaint.yBottom
);
} // end of wxBitmapButton::DrawButtonFocus
@@ -265,29 +269,30 @@ void wxBitmapButton::DrawButtonDisable( wxClientDC& rDC,
// Note: DrawLine expects wxWidgets coordinate system so swap
//
rDC.SetPen(vGreyPen);
wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl();
// top
rDC.DrawLine( rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yBottom
,rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yBottom
rDC.DrawLine( impl->m_vRclPaint.xLeft
,impl->m_vRclPaint.yBottom
,impl->m_vRclPaint.xRight
,impl->m_vRclPaint.yBottom
);
// right
rDC.DrawLine( rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yBottom
,rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yTop
rDC.DrawLine( impl->m_vRclPaint.xRight
,impl->m_vRclPaint.yBottom
,impl->m_vRclPaint.xRight
,impl->m_vRclPaint.yTop
);
// bottom
rDC.DrawLine( rDC.m_vRclPaint.xRight
,rDC.m_vRclPaint.yTop
,rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yTop
rDC.DrawLine( impl->m_vRclPaint.xRight
,impl->m_vRclPaint.yTop
,impl->m_vRclPaint.xLeft
,impl->m_vRclPaint.yTop
);
// left
rDC.DrawLine( rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yTop
,rDC.m_vRclPaint.xLeft
,rDC.m_vRclPaint.yBottom
rDC.DrawLine( impl->m_vRclPaint.xLeft
,impl->m_vRclPaint.yTop
,impl->m_vRclPaint.xLeft
,impl->m_vRclPaint.yBottom
);
wxDisableBitmap(rBmp, vGreyPen.GetColour().GetPixel());
} // end of wxBitmapButton::DrawButtonDisable