X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ff066a4ecb73476fc67c7a2c8a8823e67add833..d2b23b67301bd2d286366d4326a21da3132558fa:/src/msw/checklst.cpp diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 2ce8fb4f5f..2fb4e4e508 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: @@ -17,20 +17,19 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "checklst.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#if wxUSE_OWNER_DRAWN +#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" @@ -38,24 +37,17 @@ #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" -#if defined(__GNUWIN32_OLD__) - #include "wx/msw/gnuwin32/extra.h" -#endif - // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- @@ -67,8 +59,8 @@ // implementation // ============================================================================ -// TODO: wxCONSTRUCTOR -#if 0 // wxUSE_EXTENDED_RTTI + +#if wxUSE_EXTENDED_RTTI WX_DEFINE_FLAGS( wxCheckListBoxStyle ) wxBEGIN_FLAGS( wxCheckListBoxStyle ) @@ -80,21 +72,21 @@ wxBEGIN_FLAGS( wxCheckListBoxStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) wxFLAGS_MEMBER(wxDOUBLE_BORDER) wxFLAGS_MEMBER(wxRAISED_BORDER) wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxNO_BORDER) + wxFLAGS_MEMBER(wxBORDER) // standard window styles wxFLAGS_MEMBER(wxTAB_TRAVERSAL) wxFLAGS_MEMBER(wxCLIP_CHILDREN) wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) wxFLAGS_MEMBER(wxVSCROLL) wxFLAGS_MEMBER(wxHSCROLL) @@ -106,26 +98,26 @@ wxBEGIN_FLAGS( wxCheckListBoxStyle ) wxFLAGS_MEMBER(wxLB_ALWAYS_SB) wxFLAGS_MEMBER(wxLB_NEEDED_SB) wxFLAGS_MEMBER(wxLB_SORT) + wxFLAGS_MEMBER(wxLB_OWNERDRAW) wxEND_FLAGS( wxCheckListBoxStyle ) IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox,"wx/checklst.h") wxBEGIN_PROPERTIES_TABLE(wxCheckListBox) - wxEVENT_PROPERTY( Toggle , wxEVT_COMMAND_CHECKLISTBOX_TOGGLED , wxCommandEvent ) - - wxPROPERTY_FLAGS( WindowStyle , wxCheckListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style + wxEVENT_PROPERTY( Toggle , wxEVT_COMMAND_CHECKLISTBOX_TOGGLED , wxCommandEvent ) + wxPROPERTY_FLAGS( WindowStyle , wxCheckListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , wxLB_OWNERDRAW /*flags*/ , wxT("Helpstring") , wxT("group")) // style wxEND_PROPERTIES_TABLE() +wxBEGIN_HANDLERS_TABLE(wxCheckListBox) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_4( wxCheckListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) + #else IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) #endif -/* -TODO PROPERTIES - list content - item , checked (no) -*/ // ---------------------------------------------------------------------------- // declaration and implementation of wxCheckListBoxItem class // ---------------------------------------------------------------------------- @@ -134,137 +126,94 @@ class wxCheckListBoxItem : public wxOwnerDrawn { friend class WXDLLEXPORT 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; DECLARE_NO_COPY_CLASS(wxCheckListBoxItem) - bool m_bChecked; - wxCheckListBox *m_pParent; - size_t m_nIndex; }; wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex) - : wxOwnerDrawn(wxEmptyString, TRUE) // checkable + : wxOwnerDrawn(wxEmptyString, true) // checkable { - m_bChecked = FALSE; - m_pParent = pParent; - m_nIndex = nIndex; + 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 + // 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 - SetMarginWidth(GetDefaultMarginWidth()); -} + SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) - 2); -/* - * JACS - I've got the owner-draw stuff partially working with WIN16, - * with a really horrible-looking cross for wxCheckListBox instead of a - * check - could use a bitmap check-mark instead, defined in wx.rc. - * Also there's a refresh problem whereby it doesn't always draw the - * check until you click to the right of it, which is OK for WIN32. - */ + SetBackgroundColour(pParent->GetBackgroundColour()); +} bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) { - if ( IsChecked() ) - stat = (wxOwnerDrawn::wxODStatus)(stat | wxOwnerDrawn::wxODChecked); - - if ( wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) ) { - // ## using native API for performance and precision - size_t nCheckWidth = GetDefaultMarginWidth(), - nCheckHeight = m_pParent->GetItemHeight(); + // first draw the label + if ( IsChecked() ) + stat = (wxOwnerDrawn::wxODStatus)(stat | wxOwnerDrawn::wxODChecked); - int x = rc.GetX(), - y = rc.GetY(); + if ( !wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) ) + return false; - HDC hdc = (HDC)dc.GetHDC(); + // now draw the check mark part + HDC hdc = GetHdcOf(dc); - // create pens - HPEN hpenBack = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOW)), - hpenGray = CreatePen(PS_SOLID, 0, RGB(128, 128, 128)), - hpenPrev = (HPEN)SelectObject(hdc, hpenBack); + int nBmpWidth = ::GetSystemMetrics(SM_CXMENUCHECK), + nBmpHeight = ::GetSystemMetrics(SM_CYMENUCHECK); - // we erase the 1-pixel border - Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight); - // shift check mark 1 pixel to the right (it looks better like this) - x++; + // first create bitmap in a memory DC + MemoryHDC hdcMem(hdc); + CompatibleBitmap hBmpCheck(hdc, nBmpWidth, nBmpHeight); - if ( IsChecked() ) { - // first create a monochrome bitmap in a memory DC - HDC hdcMem = CreateCompatibleDC(hdc); - HBITMAP hbmpCheck = CreateBitmap(nCheckWidth, nCheckHeight, 1, 1, 0); - HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck); - - // then draw a check mark into it - - RECT rect; - rect.left = 0; - rect.top = 0; - rect.right = nCheckWidth; - rect.bottom = nCheckHeight; - -#ifdef __WXWINCE__ - DrawFrameControl(hdcMem, &rect, DFC_BUTTON, DFCS_BUTTONCHECK); -#else - DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); -#endif - - // finally copy it to screen DC and clean up - BitBlt(hdc, x, y, nCheckWidth - 1, nCheckHeight, - hdcMem, 0, 0, SRCCOPY); - - SelectObject(hdcMem, hbmpOld); - DeleteObject(hbmpCheck); - DeleteDC(hdcMem); - } - - // now we draw the smaller rectangle - y++; - nCheckWidth -= 2; - nCheckHeight -= 2; + // then draw a check mark into it + { + SelectInHDC selBmp(hdcMem, hBmpCheck); - // draw hollow gray rectangle - (void)SelectObject(hdc, hpenGray); - HBRUSH hbrPrev = (HBRUSH)SelectObject(hdc, GetStockObject(NULL_BRUSH)); - Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight); + int flags = wxCONTROL_FLAT; + if ( IsChecked() ) + flags |= wxCONTROL_CHECKED; - // clean up - (void)SelectObject(hdc, hpenPrev); - (void)SelectObject(hdc, hbrPrev); + wxDCTemp dcMem(hdcMem); + wxRendererNative::Get().DrawCheckBox( + m_pParent, dcMem, wxRect(0, 0, nBmpWidth, nBmpHeight), flags); + } // select hBmpCheck out of hdcMem - DeleteObject(hpenBack); - DeleteObject(hpenGray); + // shift check mark 2 pixel to the right and bottom, looks better like this + int x = rc.GetX() + 2, + y = rc.GetY() + 2; - /* - dc.DrawRectangle(x, y, nCheckWidth, nCheckHeight); + // 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); - if ( IsChecked() ) { - dc.DrawLine(x, y, x + nCheckWidth, y + nCheckHeight); - dc.DrawLine(x, y + nCheckHeight, x + nCheckWidth, y); - } - */ + UINT fStyle = stat & wxOwnerDrawn::wxODSelected ? ILD_SELECTED : ILD_NORMAL; + ImageList_Draw(himl, 0, hdc, x, y, fStyle); - return TRUE; - } + ImageList_Destroy(himl); - return FALSE; + return true; } // change the state of the item and redraw it @@ -285,26 +234,15 @@ void wxCheckListBoxItem::Check(bool check) HWND hwndListbox = (HWND)m_pParent->GetHWND(); - #ifdef __WIN32__ - RECT rcUpdate; + RECT rcUpdate; - if ( ::SendMessage(hwndListbox, LB_GETITEMRECT, - m_nIndex, (LPARAM)&rcUpdate) == LB_ERR ) - { - wxLogDebug(wxT("LB_GETITEMRECT failed")); - } - #else // Win16 - // FIXME this doesn't work if the listbox is scrolled! - size_t nHeight = m_pParent->GetItemHeight(); - size_t y = m_nIndex * nHeight; - RECT rcUpdate ; - rcUpdate.left = 0 ; - rcUpdate.top = y ; - rcUpdate.right = GetDefaultMarginWidth() ; - rcUpdate.bottom = y + nHeight ; - #endif // Win32/16 - - InvalidateRect(hwndListbox, &rcUpdate, FALSE); + if ( ::SendMessage(hwndListbox, LB_GETITEMRECT, + m_nIndex, (LPARAM)&rcUpdate) == LB_ERR ) + { + wxLogDebug(wxT("LB_GETITEMRECT failed")); + } + + ::InvalidateRect(hwndListbox, &rcUpdate, FALSE); } // send an "item checked" event @@ -345,6 +283,15 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, Create(parent, id, pos, size, nStrings, choices, style, val, name); } +wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, + const wxArrayString& choices, + long style, const wxValidator& val, + const wxString& name) +{ + Create(parent, id, pos, size, choices, style, val, name); +} + bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, int n, const wxString choices[], @@ -355,31 +302,41 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, style | wxLB_OWNERDRAW, validator, name); } +bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, const wxString& name) +{ + return wxListBox::Create(parent, id, pos, size, choices, + style | wxLB_OWNERDRAW, validator, name); +} + // 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); wxListBox::SetFont(font); - return TRUE; + return true; } // create/retrieve item @@ -399,31 +356,32 @@ 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; + return true; } - return FALSE; + return false; } // 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); } @@ -517,26 +475,28 @@ 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 { - #ifdef __WIN32__ int nItem = (int)::SendMessage ( (HWND)GetHWND(), @@ -544,13 +504,17 @@ int wxCheckListBox::DoHitTestItem(wxCoord x, wxCoord y) const 0, MAKELPARAM(x, y) ); - #else // Win16 - // FIXME this doesn't work when the listbox is scrolled! - int nItem = y / m_nItemHeight; - #endif // Win32/16 - return nItem >= m_noItems ? wxNOT_FOUND : nItem; + return nItem >= (int)m_noItems ? wxNOT_FOUND : nItem; } -#endif +wxSize wxCheckListBox::DoGetBestSize() const +{ + wxSize best = wxListBox::DoGetBestSize(); + best.x += wxOwnerDrawn::GetDefaultMarginWidth(); // add room for the checkbox + CacheBestSize(best); + return best; +} + +#endif