X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/837e57436a89516a5fa9f478f401e06bd872c17c..93692400d0a9f89cf013e1e101701eae0a541a59:/src/msw/checklst.cpp diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index f9de4075a8..5aa72dd1e4 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -30,23 +30,28 @@ #if wxUSE_OWNER_DRAWN -#include "wx/object.h" -#include "wx/colour.h" -#include "wx/font.h" -#include "wx/bitmap.h" -#include "wx/window.h" -#include "wx/listbox.h" +#ifndef WX_PRECOMP + #include "wx/object.h" + #include "wx/colour.h" + #include "wx/font.h" + #include "wx/bitmap.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/settings.h" -#include "wx/dcmemory.h" -#include "wx/msw/checklst.h" -#include "wx/log.h" +#include "wx/checklst.h" #include #include -#ifdef __GNUWIN32__ -#include "wx/msw/gnuwin32/extra.h" +#if defined(__GNUWIN32_OLD__) + #include "wx/msw/gnuwin32/extra.h" #endif // ---------------------------------------------------------------------------- @@ -60,9 +65,7 @@ // implementation // ============================================================================ -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) // ---------------------------------------------------------------------------- // declaration and implementation of wxCheckListBoxItem class @@ -146,12 +149,14 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck); // then draw a check mark into it - RECT rect = { 0, 0, nCheckWidth, nCheckHeight }; +#if defined(__WIN32__) && !defined(__SC__) + RECT rect; + rect.left = 0; + rect.top = 0; + rect.right = nCheckWidth; + rect.bottom = nCheckHeight; -#ifdef __WIN32__ -#ifndef __SC__ DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); -#endif #else // In WIN16, draw a cross HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0)); @@ -221,7 +226,7 @@ void wxCheckListBoxItem::Check(bool check) // update it int index = m_pParent->GetItemIndex(this); - wxASSERT_MSG( index != wxNOT_FOUND, _T("what does this item do here?") ); + wxASSERT_MSG( index != wxNOT_FOUND, wxT("what does this item do here?") ); m_nIndex = (size_t)index; } @@ -234,13 +239,17 @@ void wxCheckListBoxItem::Check(bool check) if ( ::SendMessage(hwndListbox, LB_GETITEMRECT, m_nIndex, (LPARAM)&rcUpdate) == LB_ERR ) { - wxLogDebug(_T("LB_GETITEMRECT failed")); + 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 = { 0, y, GetDefaultMarginWidth(), y + nHeight}; + RECT rcUpdate ; + rcUpdate.left = 0 ; + rcUpdate.top = y ; + rcUpdate.right = GetDefaultMarginWidth() ; + rcUpdate.bottom = y + nHeight ; #endif // Win32/16 InvalidateRect(hwndListbox, &rcUpdate, FALSE); @@ -258,7 +267,7 @@ void wxCheckListBoxItem::Check(bool check) // define event table // ------------------ BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox) - EVT_CHAR(wxCheckListBox::OnChar) + EVT_KEY_DOWN(wxCheckListBox::OnKeyDown) EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick) END_EVENT_TABLE() @@ -266,7 +275,7 @@ END_EVENT_TABLE() // ---------------- // def ctor: use Create() to really create the control -wxCheckListBox::wxCheckListBox() : wxListBox() +wxCheckListBox::wxCheckListBox() { } @@ -276,7 +285,6 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, int nStrings, const wxString choices[], long style, const wxValidator& val, const wxString& name) - : wxListBox() { Create(parent, id, pos, size, nStrings, choices, style | wxLB_OWNERDRAW, val, name); @@ -285,39 +293,24 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, void wxCheckListBox::Delete(int N) { wxCHECK_RET( N >= 0 && N < m_noItems, - _T("invalid index in wxListBox::Delete") ); + wxT("invalid index in wxListBox::Delete") ); wxListBox::Delete(N); // free memory delete m_aItems[N]; - m_aItems.Remove(N); -} - -void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos) -{ - wxCHECK_RET( pos >= 0 && pos <= m_noItems, - _T("invalid index in wxCheckListBox::InsertItems") ); - - wxListBox::InsertItems(nItems, items, pos); - - int i; - for ( i = 0; i < nItems; i++ ) { - wxOwnerDrawn *pNewItem = CreateItem((size_t)(pos + i)); - pNewItem->SetName(items[i]); - m_aItems.Insert(pNewItem, (size_t)(pos + i)); - ListBox_SetItemData((HWND)GetHWND(), i + pos, pNewItem); - } + m_aItems.RemoveAt(N); } - bool wxCheckListBox::SetFont( const wxFont &font ) { size_t i; - for (i=0; i < m_aItems.GetCount(); i++) + for ( i = 0; i < m_aItems.GetCount(); i++ ) m_aItems[i]->SetFont(font); + wxListBox::SetFont(font); + return TRUE; } @@ -355,23 +348,95 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) bool wxCheckListBox::IsChecked(size_t uiIndex) const { - return GetItem(uiIndex)->IsChecked(); + wxCHECK_MSG( uiIndex < (size_t)GetCount(), FALSE, _T("bad wxCheckListBox index") ); + + return GetItem(uiIndex)->IsChecked(); } void wxCheckListBox::Check(size_t uiIndex, bool bCheck) { - GetItem(uiIndex)->Check(bCheck); + wxCHECK_RET( uiIndex < (size_t)GetCount(), _T("bad wxCheckListBox index") ); + + GetItem(uiIndex)->Check(bCheck); } // process events // -------------- -void wxCheckListBox::OnChar(wxKeyEvent& event) +void wxCheckListBox::OnKeyDown(wxKeyEvent& event) { - if ( event.KeyCode() == WXK_SPACE ) - GetItem(GetSelection())->Toggle(); - else - event.Skip(); + // what do we do? + enum + { + None, + Toggle, + Set, + Clear + } oper; + + switch ( event.KeyCode() ) + { + case WXK_SPACE: + oper = Toggle; + break; + + case WXK_NUMPAD_ADD: + case '+': + oper = Set; + break; + + case WXK_NUMPAD_SUBTRACT: + case '-': + oper = Clear; + break; + + default: + oper = None; + } + + if ( oper != None ) + { + wxArrayInt selections; + int count; + if ( HasMultipleSelection() ) + { + count = GetSelections(selections); + } + else + { + count = 1; + selections.Add(GetSelection()); + } + + for ( int i = 0; i < count; i++ ) + { + wxCheckListBoxItem *item = GetItem(selections[i]); + if ( !item ) + { + wxFAIL_MSG( _T("no wxCheckListBoxItem?") ); + continue; + } + + switch ( oper ) + { + case Toggle: + item->Toggle(); + break; + + case Set: + case Clear: + item->Check( oper == Set ); + break; + + default: + wxFAIL_MSG( _T("what should this key do?") ); + } + } + } + else // nothing to do + { + event.Skip(); + } } void wxCheckListBox::OnLeftClick(wxMouseEvent& event)