X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/910b005366bf2dbf317284d02ac47c18c2c27ee9..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/os2/bmpbuttn.cpp diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp index 12ce06f727..82bb6dde95 100644 --- a/src/os2/bmpbuttn.cpp +++ b/src/os2/bmpbuttn.cpp @@ -19,11 +19,10 @@ #ifndef WX_PRECOMP #endif +#include "wx/os2/dcclient.h" #include "wx/os2/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) - #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1) bool wxBitmapButton::Create( wxWindow* pParent, @@ -35,7 +34,7 @@ bool wxBitmapButton::Create( wxWindow* pParent, const wxValidator& rValidator, const wxString& rsName ) { - m_bmpNormal = rBitmap; + m_bitmaps[State_Normal] = rBitmap; SetName(rsName); #if wxUSE_VALIDATORS SetValidator(rValidator); @@ -63,10 +62,10 @@ bool wxBitmapButton::Create( wxWindow* pParent, else m_windowId = vId; - if (nWidth == wxDefaultCoord && rBitmap.Ok()) + if (nWidth == wxDefaultCoord && rBitmap.IsOk()) nWidth = rBitmap.GetWidth() + 4 * m_marginX; - if (nHeight == wxDefaultCoord && rBitmap.Ok()) + if (nHeight == wxDefaultCoord && rBitmap.IsOk()) nHeight = rBitmap.GetHeight() + 4 * m_marginY; ULONG ulOS2Style = WS_VISIBLE | WS_TABSTOP | BS_USERBUTTON; @@ -107,36 +106,38 @@ bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem) if (!pUser) return false; - wxBitmap* pBitmap; + wxBitmap bitmap; bool bIsSelected = pUser->fsState & BDS_HILITED; wxClientDC vDc(this); - if (bIsSelected && m_bmpSelected.Ok()) - pBitmap = &m_bmpSelected; - else if ((pUser->fsState & BDS_DEFAULT) && m_bmpFocus.Ok()) - pBitmap = &m_bmpFocus; - else if ((pUser->fsState & BDS_DISABLED) && m_bmpDisabled.Ok()) - pBitmap = &m_bmpDisabled; - else - pBitmap = &m_bmpNormal; + if (bIsSelected) + bitmap = GetBitmapPressed(); + else if (pUser->fsState & BDS_DEFAULT) + bitmap = GetBitmapFocus(); + else if (pUser->fsState & BDS_DISABLED) + bitmap = GetBitmapDisabled(); - if (!pBitmap->Ok() ) - return false; + if (!bitmap.IsOk() ) + { + bitmap = GetBitmapLabel(); + if (!bitmap.IsOk() ) + return false; + } // // Centre the bitmap in the control area // - int nX = 0; int nX1 = 0; int nY1 = 0; - int nWidth = vDc.m_vRclPaint.xRight - vDc.m_vRclPaint.xLeft; - int nHeight = vDc.m_vRclPaint.xRight - vDc.m_vRclPaint.xLeft; - int nBmpWidth = pBitmap->GetWidth(); - int nBmpHeight = pBitmap->GetHeight(); + 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 = bitmap.GetWidth(); + int nBmpHeight = bitmap.GetHeight(); - nX1 = nX + (nWidth - nBmpWidth) / 2; - nY1 = nX + (nHeight - nBmpHeight) / 2; + nX1 = (nWidth - nBmpWidth) / 2; + nY1 = (nHeight - nBmpHeight) / 2; if (bIsSelected && bAutoDraw) { @@ -147,25 +148,19 @@ bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem) // // Draw the button face // - { - DrawFace( vDc - ,bIsSelected - ); - } + DrawFace( vDc, bIsSelected ); // // Draw the bitmap // - vDc.DrawBitmap( *pBitmap, nX1, nY1, true ); + vDc.DrawBitmap( bitmap, nX1, nY1, true ); // // Draw focus / disabled state, if auto-drawing // if ((pUser->fsState == BDS_DISABLED) && bAutoDraw) { - DrawButtonDisable( vDc - ,*pBitmap - ); + DrawButtonDisable( vDc, bitmap ); } else if ((pUser->fsState == BDS_DEFAULT) && bAutoDraw) { @@ -187,33 +182,41 @@ void wxBitmapButton::DrawFace (wxClientDC& rDC, bool bSel) // // Draw the main button face // - ::WinFillRect(rDC.GetHPS(), &rDC.m_vRclPaint, vFaceColor.GetPixel()); + // This triggers a redraw and destroys the bottom & left focus border and + // doesn't seem to do anything useful. + // ::WinFillRect(rDC.GetHPS(), &rDC.m_vRclPaint, vFaceColor.GetPixel()); // // Draw the border + // Note: DrawLine expects wxWidgets coordinate system so swap // rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen); - rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1 - ,rDC.m_vRclPaint.yTop - 1 - ,rDC.m_vRclPaint.xRight - 1 - ,rDC.m_vRclPaint.yTop - 1 + wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl(); + // top + rDC.DrawLine( impl->m_vRclPaint.xLeft + 1 + ,impl->m_vRclPaint.yBottom + 1 + ,impl->m_vRclPaint.xRight - 1 + ,impl->m_vRclPaint.yBottom + 1 ); - rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1 - ,rDC.m_vRclPaint.yTop - 1 - ,rDC.m_vRclPaint.xLeft + 1 - ,rDC.m_vRclPaint.yBottom + 1 + // left + 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); - rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1 - ,rDC.m_vRclPaint.yBottom + 1 - ,rDC.m_vRclPaint.xRight - 1 - ,rDC.m_vRclPaint.yBottom + 1 + // bottom + rDC.DrawLine( impl->m_vRclPaint.xLeft + 1 + ,impl->m_vRclPaint.yTop - 1 + ,impl->m_vRclPaint.xRight - 1 + ,impl->m_vRclPaint.yTop - 1 ); - rDC.DrawLine( rDC.m_vRclPaint.xRight - 1 - ,rDC.m_vRclPaint.yTop - 1 - ,rDC.m_vRclPaint.xRight - 1 - ,rDC.m_vRclPaint.yBottom + 1 + // right + 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 @@ -226,27 +229,33 @@ void wxBitmapButton::DrawButtonFocus ( // // Draw a thick black line around the outside of the button + // Note: DrawLine expects wxWidgets coordinate system so swap // rDC.SetPen(vBlackPen); - rDC.DrawLine( rDC.m_vRclPaint.xLeft - ,rDC.m_vRclPaint.yTop - ,rDC.m_vRclPaint.xRight - ,rDC.m_vRclPaint.yTop + wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl(); + // top + rDC.DrawLine( impl->m_vRclPaint.xLeft + ,impl->m_vRclPaint.yBottom + ,impl->m_vRclPaint.xRight + ,impl->m_vRclPaint.yBottom ); - rDC.DrawLine( rDC.m_vRclPaint.xRight - ,rDC.m_vRclPaint.yTop - ,rDC.m_vRclPaint.xRight - ,rDC.m_vRclPaint.yBottom + // right + rDC.DrawLine( impl->m_vRclPaint.xRight + ,impl->m_vRclPaint.yBottom + ,impl->m_vRclPaint.xRight + ,impl->m_vRclPaint.yTop ); - rDC.DrawLine( rDC.m_vRclPaint.xRight - ,rDC.m_vRclPaint.yBottom - ,rDC.m_vRclPaint.xLeft - ,rDC.m_vRclPaint.yBottom + // bottom + rDC.DrawLine( impl->m_vRclPaint.xRight + ,impl->m_vRclPaint.yTop + ,impl->m_vRclPaint.xLeft + ,impl->m_vRclPaint.yTop ); - rDC.DrawLine( rDC.m_vRclPaint.xLeft - ,rDC.m_vRclPaint.yBottom - ,rDC.m_vRclPaint.xLeft - ,rDC.m_vRclPaint.yTop + // left + rDC.DrawLine( impl->m_vRclPaint.xLeft + ,impl->m_vRclPaint.yTop + ,impl->m_vRclPaint.xLeft + ,impl->m_vRclPaint.yBottom ); } // end of wxBitmapButton::DrawButtonFocus @@ -257,34 +266,35 @@ void wxBitmapButton::DrawButtonDisable( wxClientDC& rDC, // // Draw a thick black line around the outside of the button + // Note: DrawLine expects wxWidgets coordinate system so swap // rDC.SetPen(vGreyPen); - rDC.DrawLine( rDC.m_vRclPaint.xLeft - ,rDC.m_vRclPaint.yTop - ,rDC.m_vRclPaint.xRight - ,rDC.m_vRclPaint.yTop + wxPMDCImpl *impl = (wxPMDCImpl*) rDC.GetImpl(); + // top + rDC.DrawLine( impl->m_vRclPaint.xLeft + ,impl->m_vRclPaint.yBottom + ,impl->m_vRclPaint.xRight + ,impl->m_vRclPaint.yBottom ); - rDC.DrawLine( rDC.m_vRclPaint.xRight - ,rDC.m_vRclPaint.yTop - ,rDC.m_vRclPaint.xRight - ,rDC.m_vRclPaint.yBottom + // right + rDC.DrawLine( impl->m_vRclPaint.xRight + ,impl->m_vRclPaint.yBottom + ,impl->m_vRclPaint.xRight + ,impl->m_vRclPaint.yTop ); - rDC.DrawLine( rDC.m_vRclPaint.xRight - ,rDC.m_vRclPaint.yBottom - ,rDC.m_vRclPaint.xLeft - ,rDC.m_vRclPaint.yBottom + // bottom + rDC.DrawLine( impl->m_vRclPaint.xRight + ,impl->m_vRclPaint.yTop + ,impl->m_vRclPaint.xLeft + ,impl->m_vRclPaint.yTop ); - rDC.DrawLine( rDC.m_vRclPaint.xLeft - ,rDC.m_vRclPaint.yBottom - ,rDC.m_vRclPaint.xLeft - ,rDC.m_vRclPaint.yTop + // left + 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 -void wxBitmapButton::SetDefault() -{ - wxButton::SetDefault(); -} - #endif // ndef for wxUSE_BMPBUTTON