X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ee3ee1bc8ac2f95029835ebc115fac0a1fbd02a..a7aeddacf9dfcb9dca64fccb5f65f387bcff0fb2:/src/common/lboxcmn.cpp diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp index 8525ef8104..8787130451 100644 --- a/src/common/lboxcmn.cpp +++ b/src/common/lboxcmn.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/lboxcmn.cpp +// Name: src/common/lboxcmn.cpp // Purpose: wxListBox class methods common to all platforms // Author: Vadim Zeitlin // Modified by: // Created: 22.10.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team -// Licence: wxWindows licence +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "listboxbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,124 +24,214 @@ #pragma hdrstop #endif +#if wxUSE_LISTBOX + +#include "wx/listbox.h" + #ifndef WX_PRECOMP - #include "wx/listbox.h" + #include "wx/dynarray.h" + #include "wx/arrstr.h" #endif +#include "wx/log.h" + // ============================================================================ // implementation // ============================================================================ +wxListBoxBase::~wxListBoxBase() +{ + // this destructor is required for Darwin +} + // ---------------------------------------------------------------------------- -// adding items +// selection // ---------------------------------------------------------------------------- -void wxListBoxBase::InsertItems(int nItems, const wxString *items, int pos) +bool wxListBoxBase::SetStringSelection(const wxString& s, bool select) { - wxArrayString aItems; - for ( int n = 0; n < nItems; n++ ) - { - aItems.Add(items[n]); - } + const int sel = FindString(s); + if ( sel == wxNOT_FOUND ) + return false; - DoInsertItems(aItems, pos); -} + SetSelection(sel, select); + return true; +} -void wxListBoxBase::Set(int nItems, const wxString* items, void **clientData) +void wxListBoxBase::DeselectAll(int itemToLeaveSelected) { - wxArrayString aItems; - for ( int n = 0; n < nItems; n++ ) + if ( HasMultipleSelection() ) { - aItems.Add(items[n]); + wxArrayInt selections; + GetSelections(selections); + + size_t count = selections.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + int item = selections[n]; + if ( item != itemToLeaveSelected ) + Deselect(item); + } + } + else // single selection + { + int sel = GetSelection(); + if ( sel != wxNOT_FOUND && sel != itemToLeaveSelected ) + { + Deselect(sel); + } } - - DoSetItems(aItems, clientData); } -// ---------------------------------------------------------------------------- -// selection -// ---------------------------------------------------------------------------- - -wxString wxListBoxBase::GetStringSelection () const +void wxListBoxBase::UpdateOldSelections() { - wxString s; - int sel = GetSelection(); - if ( sel != -1 ) - s = GetString(sel); - - return s; + // We need to remember the selection even in single-selection case on + // Windows, so that we don't send an event when the user clicks on an + // already selected item. +#ifndef __WXMSW__ + if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED)) +#endif + { + GetSelections( m_oldSelections ); + } } -bool wxListBoxBase::SetStringSelection(const wxString& s, bool select) +bool wxListBoxBase::SendEvent(wxEventType evtType, int item, bool selected) { - int sel = FindString(s); - wxCHECK_MSG( sel != -1, FALSE, - wxT("invalid string in wxListBox::SetStringSelection") ); + wxCommandEvent event(evtType, GetId()); + event.SetEventObject(this); - SetSelection(sel, select); + event.SetInt(item); + event.SetString(GetString(item)); + event.SetExtraLong(selected); - return TRUE; -} + if ( HasClientObjectData() ) + event.SetClientObject(GetClientObject(item)); + else if ( HasClientUntypedData() ) + event.SetClientData(GetClientData(item)); -// ---------------------------------------------------------------------------- -// client data -// ---------------------------------------------------------------------------- + return HandleWindowEvent(event); +} -void wxListBoxBase::SetClientObject(int n, wxClientData *data) +bool wxListBoxBase::CalcAndSendEvent() { - wxASSERT_MSG( m_clientDataItemsType != ClientData_Void, - wxT("can't have both object and void client data") ); + wxArrayInt selections; + GetSelections(selections); + bool selected = true; - wxClientData *clientDataOld = DoGetClientObject(n); - if ( clientDataOld ) - delete clientDataOld; + if ( selections.empty() && m_oldSelections.empty() ) + { + // nothing changed, just leave + return false; + } - DoSetClientObject(n, data); - m_clientDataItemsType = ClientData_Object; -} + const size_t countSel = selections.size(), + countSelOld = m_oldSelections.size(); + if ( countSel == countSelOld ) + { + bool changed = false; + for ( size_t idx = 0; idx < countSel; idx++ ) + { + if (selections[idx] != m_oldSelections[idx]) + { + changed = true; + break; + } + } + + // nothing changed, just leave + if ( !changed ) + return false; + } -wxClientData *wxListBoxBase::GetClientObject(int n) const -{ - wxASSERT_MSG( m_clientDataItemsType == ClientData_Object, - wxT("this window doesn't have object client data") ); + int item = wxNOT_FOUND; + if ( selections.empty() ) + { + selected = false; + item = m_oldSelections[0]; + } + else // we [still] have some selections + { + // Now test if any new item is selected + bool any_new_selected = false; + for ( size_t idx = 0; idx < countSel; idx++ ) + { + item = selections[idx]; + if ( m_oldSelections.Index(item) == wxNOT_FOUND ) + { + any_new_selected = true; + break; + } + } + + if ( !any_new_selected ) + { + // No new items selected, now test if any new item is deselected + bool any_new_deselected = false; + for ( size_t idx = 0; idx < countSelOld; idx++ ) + { + item = m_oldSelections[idx]; + if ( selections.Index(item) == wxNOT_FOUND ) + { + any_new_deselected = true; + break; + } + } + + if ( any_new_deselected ) + { + // indicate that this is a selection + selected = false; + } + else + { + item = wxNOT_FOUND; // this should be impossible + } + } + } - return DoGetClientObject(n); -} + wxASSERT_MSG( item != wxNOT_FOUND, + "Logic error in wxListBox selection event generation code" ); -void wxListBoxBase::SetClientData(int n, void *data) -{ - wxASSERT_MSG( m_clientDataItemsType != ClientData_Object, - wxT("can't have both object and void client data") ); + m_oldSelections = selections; - DoSetClientData(n, data); - m_clientDataItemsType = ClientData_Void; + return SendEvent(wxEVT_COMMAND_LISTBOX_SELECTED, item, selected); } -void *wxListBoxBase::GetClientData(int n) const -{ - wxASSERT_MSG( m_clientDataItemsType == ClientData_Void, - wxT("this window doesn't have void client data") ); +// ---------------------------------------------------------------------------- +// misc +// ---------------------------------------------------------------------------- - return DoGetClientData(n); +void wxListBoxBase::Command(wxCommandEvent& event) +{ + SetSelection(event.GetInt(), event.GetExtraLong() != 0); + (void)GetEventHandler()->ProcessEvent(event); } // ---------------------------------------------------------------------------- -// misc +// SetFirstItem() and such // ---------------------------------------------------------------------------- void wxListBoxBase::SetFirstItem(const wxString& s) { int n = FindString(s); - wxCHECK_RET( n != -1, wxT("invalid string in wxListBox::SetFirstItem") ); + wxCHECK_RET( n != wxNOT_FOUND, wxT("invalid string in wxListBox::SetFirstItem") ); DoSetFirstItem(n); } -void wxListBoxBase::Command(wxCommandEvent & event) +void wxListBoxBase::AppendAndEnsureVisible(const wxString& s) +{ + Append(s); + EnsureVisible(GetCount() - 1); +} + +void wxListBoxBase::EnsureVisible(int WXUNUSED(n)) { - SetSelection(event.m_commandInt, event.m_extraLong); - (void)ProcessEvent(event); + // the base class version does nothing (the only alternative would be to + // call SetFirstItem() but this is probably even more stupid) } +#endif // wxUSE_LISTBOX