#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"
#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 <windowsx.h>
+#include "wx/renderer.h"
#include "wx/msw/private.h"
+#include "wx/msw/dc.h"
// ----------------------------------------------------------------------------
// private functions
class wxCheckListBoxItem : public wxOwnerDrawn
{
-friend class WXDLLEXPORT wxCheckListBox;
+friend class WXDLLIMPEXP_FWD_CORE wxCheckListBox;
public:
// ctor
wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);
private:
bool m_bChecked;
wxCheckListBox *m_pParent;
- size_t m_nIndex;
+ size_t m_nIndex;
DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)
};
// 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);
+ SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) - 2);
+
SetBackgroundColour(pParent->GetBackgroundColour());
}
if ( !wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) )
return false;
-
+ wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
// now draw the check mark part
- size_t nCheckWidth = GetDefaultMarginWidth(),
- nCheckHeight = m_pParent->GetItemHeight();
+ HDC hdc = GetHdcOf(*impl);
- int x = rc.GetX(),
- y = rc.GetY();
+ int nBmpWidth = ::GetSystemMetrics(SM_CXMENUCHECK),
+ nBmpHeight = ::GetSystemMetrics(SM_CYMENUCHECK);
- HDC hdc = (HDC)dc.GetHDC();
- // create pens, brushes &c
- COLORREF colBg = ::GetSysColor(COLOR_WINDOW);
- AutoHPEN hpenBack(colBg),
- hpenGray(RGB(0xc0, 0xc0, 0xc0));
+ // first create bitmap in a memory DC
+ MemoryHDC hdcMem(hdc);
+ CompatibleBitmap hBmpCheck(hdc, nBmpWidth, nBmpHeight);
- SelectInHDC selPen(hdc, (HGDIOBJ)hpenBack);
- AutoHBRUSH hbrBack(colBg);
- SelectInHDC selBrush(hdc, hbrBack);
+ // then draw a check mark into it
+ {
+ SelectInHDC selBmp(hdcMem, hBmpCheck);
- // erase the background: it could have been filled with the selected colour
- Rectangle(hdc, x, y, x + nCheckWidth + 1, rc.GetBottom() + 1);
+ int flags = wxCONTROL_FLAT;
+ if ( IsChecked() )
+ flags |= wxCONTROL_CHECKED;
- // shift check mark 1 pixel to the right, looks better like this
- x++;
+ wxDCTemp dcMem(hdcMem);
+ wxRendererNative::Get().DrawCheckBox(
+ m_pParent, dcMem, wxRect(0, 0, nBmpWidth, nBmpHeight), flags);
+ } // select hBmpCheck out of hdcMem
- 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
- );
-
- // 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;
}
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);
}
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;
}
if ( nItem != wxNOT_FOUND )
{
- wxCheckListBoxItem *item = GetItem(nItem);
- item->Toggle();
- item->SendEvent();
+ // people expect to get "kill focus" event for the currently
+ // focused control before getting events from the other controls
+ // and, equally importantly, they may prevent the focus change from
+ // taking place at all (e.g. because the old control contents is
+ // invalid and needs to be corrected) in which case we shouldn't
+ // generate this event at all
+ SetFocus();
+ if ( FindFocus() == this )
+ {
+ wxCheckListBoxItem *item = GetItem(nItem);
+ item->Toggle();
+ item->SendEvent();
+ }
}
//else: it's not an error, just click outside of client zone
}
projects / wxWidgets.git / blobdiff