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

more native look for wxCheckListBox (especially under XP) (modified patch 1690068)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-04-16 01:26:13 +00:00
parent 8a46124968
commit ff0d9d83cd
2 changed files with 36 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -128,6 +128,7 @@ wxMSW:
- Fixed infinite loop in wxThread::Wait() in console applications. - Fixed infinite loop in wxThread::Wait() in console applications.
- Return the restored window size from GetSize() when window is minimized. - Return the restored window size from GetSize() when window is minimized.
- wxCheckListBox now looks more natively, especially under XP (Marcin Malich)
wxX11: wxX11:

88
src/msw/checklst.cpp
View File

@ -45,6 +45,7 @@
#include <windowsx.h> #include <windowsx.h>
#include "wx/renderer.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -142,7 +143,7 @@ public:
private: private:
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) DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)
}; };
@ -158,10 +159,8 @@ 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 for check list boxes: they don't look quite the same as SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) - 2);
// menu icons
SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) -
2*wxSystemSettings::GetMetric(wxSYS_EDGE_X) + 1);
SetBackgroundColour(pParent->GetBackgroundColour()); SetBackgroundColour(pParent->GetBackgroundColour());
} }
@ -175,62 +174,44 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
if ( !wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) ) if ( !wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) )
return false; return false;
// now draw the check mark part // now draw the check mark part
size_t nCheckWidth = GetDefaultMarginWidth(), HDC hdc = GetHdcOf(dc);
nCheckHeight = m_pParent->GetItemHeight();
int x = rc.GetX(), int nBmpWidth = ::GetSystemMetrics(SM_CXMENUCHECK),
y = rc.GetY(); nBmpHeight = ::GetSystemMetrics(SM_CYMENUCHECK);
HDC hdc = (HDC)dc.GetHDC();
// create pens, brushes &c // first create bitmap in a memory DC
COLORREF colBg = ::GetSysColor(COLOR_WINDOW); MemoryHDC hdcMem(hdc);
AutoHPEN hpenBack(colBg), CompatibleBitmap hBmpCheck(hdc, nBmpWidth, nBmpHeight);
hpenGray(RGB(0xc0, 0xc0, 0xc0));
SelectInHDC selPen(hdc, (HGDIOBJ)hpenBack); // then draw a check mark into it
AutoHBRUSH hbrBack(colBg);
SelectInHDC selBrush(hdc, hbrBack);
// 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++;
if ( IsChecked() )
{ {
// first create a monochrome bitmap in a memory DC SelectInHDC selBmp(hdcMem, hBmpCheck);
MemoryHDC hdcMem(hdc);
MonoBitmap hbmpCheck(nCheckWidth, nCheckHeight);
SelectInHDC selBmp(hdcMem, hbmpCheck);
// then draw a check mark into it int flags = wxCONTROL_FLAT;
RECT rect = { 0, 0, nCheckWidth, nCheckHeight }; if ( IsChecked() )
::DrawFrameControl(hdcMem, &rect, flags |= wxCONTROL_CHECKED;
#ifdef __WXWINCE__
DFC_BUTTON, DFCS_BUTTONCHECK
#else
DFC_MENU, DFCS_MENUCHECK
#endif
);
// finally copy it to screen DC wxDCTemp dcMem(hdcMem);
::BitBlt(hdc, x, y, nCheckWidth, nCheckHeight, hdcMem, 0, 0, SRCCOPY); wxRendererNative::Get().DrawCheckBox(
} m_pParent, dcMem, wxRect(0, 0, nBmpWidth, nBmpHeight), flags);
} // select hBmpCheck out of hdcMem
// now we draw the smaller rectangle // shift check mark 2 pixel to the right and bottom, looks better like this
y++; int x = rc.GetX() + 2,
nCheckWidth -= 2; y = rc.GetY() + 2;
nCheckHeight -= 2;
// draw hollow gray rectangle // finally draw bitmap to screen: uses image list functions to blend
(void)::SelectObject(hdc, (HGDIOBJ)hpenGray); // the bitmap with the background colour (better for the selected items)
HIMAGELIST himl = ImageList_Create(nBmpWidth, nBmpHeight,
ILC_COLOR32 | ILC_MASK, 1, 1);
ImageList_Add(himl, hBmpCheck, NULL);
SelectInHDC selBrush2(hdc, ::GetStockObject(NULL_BRUSH)); UINT fStyle = stat & wxOwnerDrawn::wxODSelected ? ILD_SELECTED : ILD_NORMAL;
Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight); ImageList_Draw(himl, 0, hdc, x, y, fStyle);
ImageList_Destroy(himl);
return true; return true;
} }
@ -375,12 +356,13 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
if ( wxListBox::MSWOnMeasure(item) ) { if ( wxListBox::MSWOnMeasure(item) ) {
MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item; MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
// add place for the check mark
pStruct->itemWidth += wxOwnerDrawn::GetDefaultMarginWidth();
pStruct->itemHeight += 1;
// save item height // save item height
m_nItemHeight = pStruct->itemHeight; m_nItemHeight = pStruct->itemHeight;
// add place for the check mark
pStruct->itemWidth += wxOwnerDrawn::GetDefaultMarginWidth();
return true; return true;
} }