X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d90879fa39fd71f4fd270e0fe38c851690781dbc..9175b26272dc4f9062bf268fa916f5b7a21d1dc6:/src/msw/checklst.cpp?ds=inline diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 5aa72dd1e4..e13cc98cf2 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -6,7 +6,7 @@ // Created: 16.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "checklst.h" #endif @@ -28,7 +28,7 @@ #pragma hdrstop #endif -#if wxUSE_OWNER_DRAWN +#if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN #ifndef WX_PRECOMP #include "wx/object.h" @@ -47,9 +47,11 @@ #include "wx/ownerdrw.h" #include "wx/checklst.h" -#include +#include "wx/msw/wrapwin.h" #include +#include "wx/msw/private.h" + #if defined(__GNUWIN32_OLD__) #include "wx/msw/gnuwin32/extra.h" #endif @@ -65,7 +67,64 @@ // implementation // ============================================================================ + +#if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxCheckListBoxStyle ) + +wxBEGIN_FLAGS( wxCheckListBoxStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + 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(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + + wxFLAGS_MEMBER(wxLB_SINGLE) + wxFLAGS_MEMBER(wxLB_MULTIPLE) + wxFLAGS_MEMBER(wxLB_EXTENDED) + wxFLAGS_MEMBER(wxLB_HSCROLL) + 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 , 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 // ---------------------------------------------------------------------------- // declaration and implementation of wxCheckListBoxItem class @@ -73,7 +132,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) class wxCheckListBoxItem : public wxOwnerDrawn { -friend class wxCheckListBox; +friend class WXDLLEXPORT wxCheckListBox; public: // ctor wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex); @@ -81,21 +140,26 @@ public: // drawing functions virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat); - // simple accessors - 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 SendEvent(); + private: + + DECLARE_NO_COPY_CLASS(wxCheckListBoxItem) bool m_bChecked; wxCheckListBox *m_pParent; - size_t m_nIndex; + size_t m_nIndex; }; wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex) - : wxOwnerDrawn("", TRUE) // checkable + : wxOwnerDrawn(wxEmptyString, true) // checkable { - m_bChecked = FALSE; + m_bChecked = false; m_pParent = pParent; m_nIndex = nIndex; @@ -107,14 +171,6 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex) SetMarginWidth(GetDefaultMarginWidth()); } -/* - * 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. - */ - bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) { @@ -149,29 +205,17 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck); // then draw a check mark into it -#if defined(__WIN32__) && !defined(__SC__) + RECT rect; rect.left = 0; rect.top = 0; rect.right = nCheckWidth; rect.bottom = nCheckHeight; - DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); +#ifdef __WXWINCE__ + DrawFrameControl(hdcMem, &rect, DFC_BUTTON, DFCS_BUTTONCHECK); #else - // In WIN16, draw a cross - HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0)); - HPEN whiteBrush = (HPEN)GetStockObject(WHITE_BRUSH); - HPEN hPenOld = (HPEN)::SelectObject(hdcMem, blackPen); - HPEN hBrushOld = (HPEN)::SelectObject(hdcMem, whiteBrush); - ::SetROP2(hdcMem, R2_COPYPEN); - Rectangle(hdcMem, 0, 0, nCheckWidth, nCheckHeight); - MoveTo(hdcMem, 0, 0); - LineTo(hdcMem, nCheckWidth, nCheckHeight); - MoveTo(hdcMem, nCheckWidth, 0); - LineTo(hdcMem, 0, nCheckHeight); - ::SelectObject(hdcMem, hPenOld); - ::SelectObject(hdcMem, hBrushOld); - ::DeleteObject(blackPen); + DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); #endif // finally copy it to screen DC and clean up @@ -209,10 +253,10 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, } */ - return TRUE; + return true; } - return FALSE; + return false; } // change the state of the item and redraw it @@ -220,7 +264,7 @@ void wxCheckListBoxItem::Check(bool check) { m_bChecked = check; - // index may be chanegd because new items were added/deleted + // index may be changed because new items were added/deleted if ( m_pParent->GetItemIndex(this) != (int)m_nIndex ) { // update it @@ -233,27 +277,20 @@ 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 +void wxCheckListBoxItem::SendEvent() +{ wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId()); event.SetInt(m_nIndex); event.SetEventObject(m_pParent); @@ -286,10 +323,41 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, long style, const wxValidator& val, const wxString& name) { - Create(parent, id, pos, size, nStrings, choices, - style | wxLB_OWNERDRAW, val, name); + 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[], + long style, + const wxValidator& validator, const wxString& name) +{ + return wxListBox::Create(parent, id, pos, size, n, choices, + 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) { wxCHECK_RET( N >= 0 && N < m_noItems, @@ -311,14 +379,14 @@ bool wxCheckListBox::SetFont( const wxFont &font ) wxListBox::SetFont(font); - return TRUE; + return true; } // create/retrieve item // -------------------- // create a check list box item -wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex) +wxOwnerDrawn *wxCheckListBox::CreateLboxItem(size_t nIndex) { wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex); return pItem; @@ -337,10 +405,10 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) // add place for the check mark pStruct->itemWidth += wxOwnerDrawn::GetDefaultMarginWidth(); - return TRUE; + return true; } - return FALSE; + return false; } // check items @@ -348,7 +416,7 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) bool wxCheckListBox::IsChecked(size_t uiIndex) const { - wxCHECK_MSG( uiIndex < (size_t)GetCount(), FALSE, _T("bad wxCheckListBox index") ); + wxCHECK_MSG( uiIndex < (size_t)GetCount(), false, _T("bad wxCheckListBox index") ); return GetItem(uiIndex)->IsChecked(); } @@ -374,7 +442,7 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event) Clear } oper; - switch ( event.KeyCode() ) + switch ( event.GetKeyCode() ) { case WXK_SPACE: oper = Toggle; @@ -397,15 +465,19 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event) if ( oper != None ) { wxArrayInt selections; - int count; + int count = 0; if ( HasMultipleSelection() ) { count = GetSelections(selections); } else { - count = 1; - selections.Add(GetSelection()); + int sel = GetSelection(); + if (sel != -1) + { + count = 1; + selections.Add(sel); + } } for ( int i = 0; i < count; i++ ) @@ -431,6 +503,10 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event) default: wxFAIL_MSG( _T("what should this key do?") ); } + + // we should send an event as this has been done by the user and + // not by the program + item->SendEvent(); } } else // nothing to do @@ -443,21 +519,13 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event) { // clicking on the item selects it, clicking on the checkmark toggles if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) { - #ifdef __WIN32__ - size_t nItem = (size_t)::SendMessage - ( - (HWND)GetHWND(), - LB_ITEMFROMPOINT, - 0, - MAKELPARAM(event.GetX(), event.GetY()) - ); - #else // Win16 - // FIXME this doesn't work when the listbox is scrolled! - size_t nItem = ((size_t)event.GetY()) / m_nItemHeight; - #endif // Win32/16 - - if ( nItem < (size_t)m_noItems ) - GetItem(nItem)->Toggle(); + 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 { @@ -466,5 +534,26 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event) } } +int wxCheckListBox::DoHitTestItem(wxCoord x, wxCoord y) const +{ + int nItem = (int)::SendMessage + ( + (HWND)GetHWND(), + LB_ITEMFROMPOINT, + 0, + MAKELPARAM(x, y) + ); + + return nItem >= m_noItems ? wxNOT_FOUND : nItem; +} + + +wxSize wxCheckListBox::DoGetBestSize() const +{ + wxSize best = wxListBox::DoGetBestSize(); + best.x += wxOwnerDrawn::GetDefaultMarginWidth(); // add room for the checkbox + return best; +} + #endif