/////////////////////////////////////////////////////////////////////////////
-// Name: univ/checklst.cpp
+// Name: src/univ/checklst.cpp
// Purpose: wxCheckListBox implementation
// Author: Vadim Zeitlin
// Modified by:
#if wxUSE_CHECKLISTBOX
+#include "wx/checklst.h"
+
#ifndef WX_PRECOMP
#include "wx/log.h"
-
#include "wx/dcclient.h"
- #include "wx/checklst.h"
#include "wx/validate.h"
#endif
#include "wx/univ/inphand.h"
#include "wx/univ/theme.h"
+// ----------------------------------------------------------------------------
+// wxStdCheckListBoxInputHandler
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxStdCheckListboxInputHandler : public wxStdInputHandler
+{
+public:
+ wxStdCheckListboxInputHandler(wxInputHandler *inphand);
+
+ virtual bool HandleKey(wxInputConsumer *consumer,
+ const wxKeyEvent& event,
+ bool pressed);
+ virtual bool HandleMouse(wxInputConsumer *consumer,
+ const wxMouseEvent& event);
+};
+
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================
// wxCheckListBox functions
// ----------------------------------------------------------------------------
-bool wxCheckListBox::IsChecked(size_t item) const
+bool wxCheckListBox::IsChecked(unsigned int item) const
{
- wxCHECK_MSG( item < m_checks.GetCount(), false,
- _T("invalid index in wxCheckListBox::IsChecked") );
+ wxCHECK_MSG( IsValid(item), false,
+ wxT("invalid index in wxCheckListBox::IsChecked") );
return m_checks[item] != 0;
}
-void wxCheckListBox::Check(size_t item, bool check)
+void wxCheckListBox::Check(unsigned int item, bool check)
{
- wxCHECK_RET( item < m_checks.GetCount(),
- _T("invalid index in wxCheckListBox::Check") );
+ wxCHECK_RET( IsValid(item),
+ wxT("invalid index in wxCheckListBox::Check") );
// intermediate var is needed to avoid compiler warning with VC++
bool isChecked = m_checks[item] != 0;
// methods forwarded to wxListBox
// ----------------------------------------------------------------------------
-void wxCheckListBox::Delete(int n)
+void wxCheckListBox::DoDeleteOneItem(unsigned int n)
{
- wxCHECK_RET( n < GetCount(), _T("invalid index in wxListBox::Delete") );
-
- wxListBox::Delete(n);
+ wxListBox::DoDeleteOneItem(n);
m_checks.RemoveAt(n);
}
-int wxCheckListBox::DoAppend(const wxString& item)
+void wxCheckListBox::OnItemInserted(unsigned int pos)
{
- int pos = wxListBox::DoAppend(item);
-
- // the item is initially unchecked
m_checks.Insert(false, pos);
-
- return pos;
-}
-
-void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
-{
- wxListBox::DoInsertItems(items, pos);
-
- size_t count = items.GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- m_checks.Insert(false, pos + n);
- }
-}
-
-void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
-{
- // call it first as it does DoClear()
- wxListBox::DoSetItems(items, clientData);
-
- size_t count = items.GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- m_checks.Add(false);
- }
}
void wxCheckListBox::DoClear()
return true;
}
+/* static */
+wxInputHandler *wxCheckListBox::GetStdInputHandler(wxInputHandler *handlerDef)
+{
+ static wxStdCheckListboxInputHandler s_handler(handlerDef);
+
+ return &s_handler;
+}
+
// ----------------------------------------------------------------------------
// wxStdCheckListboxInputHandler
// ----------------------------------------------------------------------------
wxStdCheckListboxInputHandler::
wxStdCheckListboxInputHandler(wxInputHandler *inphand)
- : wxStdListboxInputHandler(inphand)
+ : wxStdInputHandler(wxListBox::GetStdInputHandler(inphand))
{
}
if ( pressed && (event.GetKeyCode() == WXK_SPACE) )
consumer->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE);
- return wxStdListboxInputHandler::HandleKey(consumer, event, pressed);
+ return wxStdInputHandler::HandleKey(consumer, event, pressed);
}
bool wxStdCheckListboxInputHandler::HandleMouse(wxInputConsumer *consumer,
if ( x >= 0 &&
x < renderer->GetCheckBitmapSize().x &&
item >= 0 &&
- item < lbox->GetCount() )
+ (unsigned int)item < lbox->GetCount() )
{
lbox->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE, item);
}
}
- return wxStdListboxInputHandler::HandleMouse(consumer, event);
+ return wxStdInputHandler::HandleMouse(consumer, event);
}
#endif // wxUSE_CHECKLISTBOX