X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..96d38a8a71955c5d7f89299b58522557331e450a:/src/msw/checklst.cpp?ds=inline diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 80e080f5d0..933537bc1b 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/checklst.cpp +// Name: src/msw/checklst.cpp // Purpose: implementation of wxCheckListBox class // Author: Vadim Zeitlin // Modified by: @@ -21,12 +21,15 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN +#include "wx/checklst.h" + #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" #include "wx/object.h" #include "wx/colour.h" #include "wx/font.h" @@ -34,18 +37,15 @@ #include "wx/window.h" #include "wx/listbox.h" #include "wx/dcmemory.h" - #include "wx/settings.h" - #include "wx/log.h" #endif #include "wx/ownerdrw.h" -#include "wx/checklst.h" -#include "wx/msw/wrapwin.h" #include +#include "wx/renderer.h" #include "wx/msw/private.h" // ---------------------------------------------------------------------------- @@ -124,46 +124,44 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) class wxCheckListBoxItem : public wxOwnerDrawn { -friend class WXDLLEXPORT wxCheckListBox; +friend class WXDLLIMPEXP_FWD_CORE wxCheckListBox; public: - // ctor - wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex); + // ctor + wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex); - // drawing functions - virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat); + // drawing functions + virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat); - // simple accessors and operations - bool IsChecked() const { return m_bChecked; } + // simple accessors and operations + bool IsChecked() const { return m_bChecked; } - void Check(bool bCheck); - void Toggle() { Check(!IsChecked()); } + void Check(bool bCheck); + void Toggle() { Check(!IsChecked()); } - void SendEvent(); + void SendEvent(); private: - bool m_bChecked; - wxCheckListBox *m_pParent; - size_t m_nIndex; + bool m_bChecked; + wxCheckListBox *m_pParent; + size_t m_nIndex; - DECLARE_NO_COPY_CLASS(wxCheckListBoxItem) + DECLARE_NO_COPY_CLASS(wxCheckListBoxItem) }; wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex) : wxOwnerDrawn(wxEmptyString, true) // checkable { - m_bChecked = false; - m_pParent = pParent; - m_nIndex = nIndex; - - // we don't initialize m_nCheckHeight/Width vars because it's - // done in OnMeasure while they are used only in OnDraw and we - // know that there will always be OnMeasure before OnDraw - - // fix appearance for check list boxes: they don't look quite the same as - // menu icons - SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) - - 2*wxSystemSettings::GetMetric(wxSYS_EDGE_X) + 1); - SetBackgroundColour(pParent->GetBackgroundColour()); + m_bChecked = false; + m_pParent = pParent; + m_nIndex = nIndex; + + // we don't initialize m_nCheckHeight/Width vars because it's + // done in OnMeasure while they are used only in OnDraw and we + // know that there will always be OnMeasure before OnDraw + + SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) - 2); + + SetBackgroundColour(pParent->GetBackgroundColour()); } bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, @@ -176,62 +174,44 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, if ( !wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) ) return false; - // now draw the check mark part - size_t nCheckWidth = GetDefaultMarginWidth(), - nCheckHeight = m_pParent->GetItemHeight(); - - int x = rc.GetX(), - y = rc.GetY(); + HDC hdc = GetHdcOf(dc); - HDC hdc = (HDC)dc.GetHDC(); + int nBmpWidth = ::GetSystemMetrics(SM_CXMENUCHECK), + nBmpHeight = ::GetSystemMetrics(SM_CYMENUCHECK); - // create pens, brushes &c - COLORREF colBg = ::GetSysColor(COLOR_WINDOW); - AutoHPEN hpenBack(colBg), - hpenGray(RGB(0xc0, 0xc0, 0xc0)); - SelectInHDC selPen(hdc, (HGDIOBJ)hpenBack); - AutoHBRUSH hbrBack(colBg); - SelectInHDC selBrush(hdc, hbrBack); + // first create bitmap in a memory DC + MemoryHDC hdcMem(hdc); + CompatibleBitmap hBmpCheck(hdc, nBmpWidth, nBmpHeight); - // erase the background: it could have been filled with the selected colour - Rectangle(hdc, x, y, x + nCheckWidth + 1, rc.GetBottom() + 1); + // then draw a check mark into it + { + SelectInHDC selBmp(hdcMem, hBmpCheck); - // shift check mark 1 pixel to the right, looks better like this - x++; + int flags = wxCONTROL_FLAT; + if ( IsChecked() ) + flags |= wxCONTROL_CHECKED; - if ( IsChecked() ) - { - // first create a monochrome bitmap in a memory DC - MemoryHDC hdcMem(hdc); - MonoBitmap hbmpCheck(nCheckWidth, nCheckHeight); - SelectInHDC selBmp(hdcMem, hbmpCheck); - - // then draw a check mark into it - RECT rect = { 0, 0, nCheckWidth, nCheckHeight }; - ::DrawFrameControl(hdcMem, &rect, -#ifdef __WXWINCE__ - DFC_BUTTON, DFCS_BUTTONCHECK -#else - DFC_MENU, DFCS_MENUCHECK -#endif - ); + wxDCTemp dcMem(hdcMem); + wxRendererNative::Get().DrawCheckBox( + m_pParent, dcMem, wxRect(0, 0, nBmpWidth, nBmpHeight), flags); + } // select hBmpCheck out of hdcMem - // finally copy it to screen DC - ::BitBlt(hdc, x, y, nCheckWidth, nCheckHeight, hdcMem, 0, 0, SRCCOPY); - } + // shift check mark 2 pixel to the right and bottom, looks better like this + int x = rc.GetX() + 2, + y = rc.GetY() + 2; - // now we draw the smaller rectangle - y++; - nCheckWidth -= 2; - nCheckHeight -= 2; + // finally draw bitmap to screen: uses image list functions to blend + // 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); - // draw hollow gray rectangle - (void)::SelectObject(hdc, (HGDIOBJ)hpenGray); + UINT fStyle = stat & wxOwnerDrawn::wxODSelected ? ILD_SELECTED : ILD_NORMAL; + ImageList_Draw(himl, 0, hdc, x, y, fStyle); - SelectInHDC selBrush2(hdc, ::GetStockObject(NULL_BRUSH)); - Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight); + ImageList_Destroy(himl); return true; } @@ -271,6 +251,7 @@ void wxCheckListBoxItem::SendEvent() wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId()); event.SetInt(m_nIndex); event.SetEventObject(m_pParent); + event.SetString(m_pParent->GetString(m_nIndex)); m_pParent->ProcessCommand(event); } @@ -335,22 +316,22 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, // misc overloaded methods // ----------------------- -void wxCheckListBox::Delete(int N) +void wxCheckListBox::Delete(unsigned int n) { - wxCHECK_RET( N >= 0 && N < m_noItems, + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::Delete") ); - wxListBox::Delete(N); + wxListBox::Delete(n); // free memory - delete m_aItems[N]; + delete m_aItems[n]; - m_aItems.RemoveAt(N); + m_aItems.RemoveAt(n); } bool wxCheckListBox::SetFont( const wxFont &font ) { - size_t i; + unsigned int i; for ( i = 0; i < m_aItems.GetCount(); i++ ) m_aItems[i]->SetFont(font); @@ -376,12 +357,13 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) if ( wxListBox::MSWOnMeasure(item) ) { MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item; + // add place for the check mark + pStruct->itemWidth += wxOwnerDrawn::GetDefaultMarginWidth(); + pStruct->itemHeight += 1; + // save item height m_nItemHeight = pStruct->itemHeight; - // add place for the check mark - pStruct->itemWidth += wxOwnerDrawn::GetDefaultMarginWidth(); - return true; } @@ -391,16 +373,16 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) // check items // ----------- -bool wxCheckListBox::IsChecked(size_t uiIndex) const +bool wxCheckListBox::IsChecked(unsigned int uiIndex) const { - wxCHECK_MSG( uiIndex < (size_t)GetCount(), false, _T("bad wxCheckListBox index") ); + wxCHECK_MSG( IsValid(uiIndex), false, _T("bad wxCheckListBox index") ); return GetItem(uiIndex)->IsChecked(); } -void wxCheckListBox::Check(size_t uiIndex, bool bCheck) +void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck) { - wxCHECK_RET( uiIndex < (size_t)GetCount(), _T("bad wxCheckListBox index") ); + wxCHECK_RET( IsValid(uiIndex), _T("bad wxCheckListBox index") ); GetItem(uiIndex)->Check(bCheck); } @@ -494,21 +476,24 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event) void wxCheckListBox::OnLeftClick(wxMouseEvent& event) { - // clicking on the item selects it, clicking on the checkmark toggles - if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) { - int nItem = HitTest(event.GetX(), event.GetY()); - - if ( nItem != wxNOT_FOUND ) { - wxCheckListBoxItem *item = GetItem(nItem); - item->Toggle(); - item->SendEvent(); + // clicking on the item selects it, clicking on the checkmark toggles + if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) + { + int nItem = HitTest(event.GetX(), event.GetY()); + + if ( nItem != wxNOT_FOUND ) + { + wxCheckListBoxItem *item = GetItem(nItem); + item->Toggle(); + item->SendEvent(); + } + //else: it's not an error, just click outside of client zone + } + else + { + // implement default behaviour: clicking on the item selects it + event.Skip(); } - //else: it's not an error, just click outside of client zone - } - else { - // implement default behaviour: clicking on the item selects it - event.Skip(); - } } int wxCheckListBox::DoHitTestItem(wxCoord x, wxCoord y) const @@ -521,7 +506,7 @@ int wxCheckListBox::DoHitTestItem(wxCoord x, wxCoord y) const MAKELPARAM(x, y) ); - return nItem >= m_noItems ? wxNOT_FOUND : nItem; + return nItem >= (int)m_noItems ? wxNOT_FOUND : nItem; } @@ -534,4 +519,3 @@ wxSize wxCheckListBox::DoGetBestSize() const } #endif -