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

use correct background colour for items drawing (closes 1192073); use AutoXXX classes instead of manually dealing with GDI objects; fixed visual bug with background of selected items

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-05-22 14:02:04 +00:00
parent cf831d8e2b
commit 0d09813094
1 changed files with 44 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/msw/checklst.cpp
View File

@@ -145,11 +145,11 @@ public:
void SendEvent(); void SendEvent();
private: private:
DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)
bool m_bChecked; bool m_bChecked;
wxCheckListBox *m_pParent; wxCheckListBox *m_pParent;
size_t m_nIndex; size_t m_nIndex;
DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)
}; };
wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex) wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
@@ -163,64 +163,67 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
// done in OnMeasure while they are used only in OnDraw and we // done in OnMeasure while they are used only in OnDraw and we
// know that there will always be OnMeasure before OnDraw // know that there will always be OnMeasure before OnDraw
// fix appearance // fix appearance for check list boxes: they don't look quite the same as
SetMarginWidth(GetDefaultMarginWidth()); // menu icons
SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) -
2*wxSystemSettings::GetMetric(wxSYS_EDGE_X) + 1);
SetBackgroundColour(pParent->GetBackgroundColour());
} }
bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
wxODAction act, wxODStatus stat) wxODAction act, wxODStatus stat)
{ {
if ( IsChecked() ) // first draw the label
stat = (wxOwnerDrawn::wxODStatus)(stat | wxOwnerDrawn::wxODChecked); if ( IsChecked() )
stat = (wxOwnerDrawn::wxODStatus)(stat | wxOwnerDrawn::wxODChecked);
if ( wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) ) { if ( !wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) )
// ## using native API for performance and precision return false;
// now draw the check mark part
size_t nCheckWidth = GetDefaultMarginWidth(), size_t nCheckWidth = GetDefaultMarginWidth(),
nCheckHeight = m_pParent->GetItemHeight(); nCheckHeight = m_pParent->GetItemHeight();
int x = rc.GetX(), int x = rc.GetX(),
y = rc.GetY(); y = rc.GetY();
HDC hdc = (HDC)dc.GetHDC(); HDC hdc = (HDC)dc.GetHDC();
// create pens // create pens, brushes &c
HPEN hpenBack = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOW)), COLORREF colBg = ::GetSysColor(COLOR_WINDOW);
hpenGray = CreatePen(PS_SOLID, 0, RGB(128, 128, 128)), AutoHPEN hpenBack(colBg),
hpenPrev = (HPEN)SelectObject(hdc, hpenBack); hpenGray(RGB(0xc0, 0xc0, 0xc0));
// we erase the 1-pixel border SelectInHDC selPen(hdc, (HGDIOBJ)hpenBack);
Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight); AutoHBRUSH hbrBack(colBg);
SelectInHDC selBrush(hdc, hbrBack);
// shift check mark 1 pixel to the right (it looks better like this) // erase the background: it could have been filled with the selected colour
Rectangle(hdc, x, y, x + nCheckWidth + 1, rc.GetBottom() + 1);
// shift check mark 1 pixel to the right, looks better like this
x++; x++;
if ( IsChecked() ) { if ( IsChecked() )
// first create a monochrome bitmap in a memory DC {
HDC hdcMem = CreateCompatibleDC(hdc); // first create a monochrome bitmap in a memory DC
HBITMAP hbmpCheck = CreateBitmap(nCheckWidth, nCheckHeight, 1, 1, 0); MemoryHDC hdcMem(hdc);
HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck); MonoBitmap hbmpCheck(nCheckWidth, nCheckHeight);
SelectInHDC selBmp(hdcMem, hbmpCheck);
// then draw a check mark into it
RECT rect;
rect.left = 0;
rect.top = 0;
rect.right = nCheckWidth;
rect.bottom = nCheckHeight;
// then draw a check mark into it
RECT rect = { 0, 0, nCheckWidth, nCheckHeight };
::DrawFrameControl(hdcMem, &rect,
#ifdef __WXWINCE__ #ifdef __WXWINCE__
DrawFrameControl(hdcMem, &rect, DFC_BUTTON, DFCS_BUTTONCHECK); DFC_BUTTON, DFCS_BUTTONCHECK
#else #else
DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); DFC_MENU, DFCS_MENUCHECK
#endif #endif
);
// finally copy it to screen DC and clean up // finally copy it to screen DC
BitBlt(hdc, x, y, nCheckWidth - 1, nCheckHeight, ::BitBlt(hdc, x, y, nCheckWidth, nCheckHeight, hdcMem, 0, 0, SRCCOPY);
hdcMem, 0, 0, SRCCOPY);
SelectObject(hdcMem, hbmpOld);
DeleteObject(hbmpCheck);
DeleteDC(hdcMem);
} }
// now we draw the smaller rectangle // now we draw the smaller rectangle
@@ -229,30 +232,12 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
nCheckHeight -= 2; nCheckHeight -= 2;
// draw hollow gray rectangle // draw hollow gray rectangle
(void)SelectObject(hdc, hpenGray); (void)::SelectObject(hdc, (HGDIOBJ)hpenGray);
HBRUSH hbrPrev = (HBRUSH)SelectObject(hdc, GetStockObject(NULL_BRUSH));
SelectInHDC selBrush2(hdc, ::GetStockObject(NULL_BRUSH));
Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight); Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
// clean up
(void)SelectObject(hdc, hpenPrev);
(void)SelectObject(hdc, hbrPrev);
DeleteObject(hpenBack);
DeleteObject(hpenGray);
/*
dc.DrawRectangle(x, y, nCheckWidth, nCheckHeight);
if ( IsChecked() ) {
dc.DrawLine(x, y, x + nCheckWidth, y + nCheckHeight);
dc.DrawLine(x, y + nCheckHeight, x + nCheckWidth, y);
}
*/
return true; return true;
}
return false;
} }
// change the state of the item and redraw it // change the state of the item and redraw it