}
}
+void wxListBoxBase::UpdateOldSelections()
+{
+ if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
+ GetSelections( m_oldSelections );
+}
+
+static void LBSendEvent( wxCommandEvent &event, wxListBoxBase *listbox, int item )
+{
+ event.SetInt( item );
+ event.SetString( listbox->GetString( item ) );
+ if ( listbox->HasClientObjectData() )
+ event.SetClientObject( listbox->GetClientObject(item) );
+ else if ( listbox->HasClientUntypedData() )
+ event.SetClientData( listbox->GetClientData(item) );
+ listbox->HandleWindowEvent( event );
+}
+
+void wxListBoxBase::CalcAndSendEvent()
+{
+ wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId() );
+ event.SetEventObject( this );
+
+ wxArrayInt selections;
+ GetSelections( selections );
+
+ if ((selections.GetCount() == 0) && (m_oldSelections.GetCount() == 0))
+ {
+ // nothing changed, just leave
+ return;
+ }
+
+ if (selections.GetCount() == m_oldSelections.GetCount())
+ {
+ bool changed = false;
+ size_t idx;
+ for (idx = 0; idx < selections.GetCount(); idx++)
+ {
+ if (selections[idx] != m_oldSelections[idx])
+ {
+ changed = true;
+ break;
+ }
+ }
+
+ // nothing changed, just leave
+ if (!changed)
+ return;
+ }
+
+ if (selections.GetCount() == 0)
+ {
+ // indicate that this is a deselection
+ event.SetExtraLong( 0 );
+ int item = m_oldSelections[0];
+ m_oldSelections = selections;
+ LBSendEvent( event, this, item );
+ return;
+ }
+
+ int item;
+ // Now test if any new item is selected
+ bool any_new_selected = false;
+ size_t idx;
+ for (idx = 0; idx < selections.GetCount(); idx++)
+ {
+ item = selections[idx];
+ if (m_oldSelections.Index(item) == wxNOT_FOUND)
+ {
+ any_new_selected = true;
+ break;
+ }
+ }
+
+ if (any_new_selected)
+ {
+ // indicate that this is a selection
+ event.SetExtraLong( 1 );
+ m_oldSelections = selections;
+ LBSendEvent( event, this, item );
+ return;
+ }
+
+ // Now test if any new item is deselected
+ bool any_new_deselected = false;
+ for (idx = 0; idx < m_oldSelections.GetCount(); 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
+ event.SetExtraLong( 0 );
+ m_oldSelections = selections;
+ LBSendEvent( event, this, item );
+ return;
+ }
+
+ wxLogError( wxT("Wrong wxListBox selection") );
+}
+
// ----------------------------------------------------------------------------
// misc
// ----------------------------------------------------------------------------
// "changed"
//-----------------------------------------------------------------------------
-static void SendEvent( wxCommandEvent &event, wxListBox *listbox, int item )
-{
- event.SetInt( item );
- event.SetString( listbox->GetString( item ) );
- if ( listbox->HasClientObjectData() )
- event.SetClientObject( listbox->GetClientObject(item) );
- else if ( listbox->HasClientUntypedData() )
- event.SetClientData( listbox->GetClientData(item) );
- listbox->HandleWindowEvent( event );
-}
-
extern "C" {
static void
gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
{
if (g_blockEventsOnDrag) return;
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
- event.SetEventObject( listbox );
-
if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED))
{
- wxArrayInt selections;
- listbox->GetSelections( selections );
-
- if ((selections.GetCount() == 0) && (listbox->m_oldSelection.GetCount() == 0))
- {
- // nothing changed, just leave
- return;
- }
-
- if (selections.GetCount() == listbox->m_oldSelection.GetCount())
- {
- bool changed = false;
- size_t idx;
- for (idx = 0; idx < selections.GetCount(); idx++)
- {
- if (selections[idx] != listbox->m_oldSelection[idx])
- {
- changed = true;
- break;
- }
- }
-
- // nothing changed, just leave
- if (!changed)
- return;
- }
-
- if (selections.GetCount() == 0)
- {
- // indicate that this is a deselection
- event.SetExtraLong( 0 );
- int item = listbox->m_oldSelection[0];
- listbox->m_oldSelection = selections;
- SendEvent( event, listbox, item );
- return;
- }
-
- int item;
- // Now test if any new item is selected
- bool any_new_selected = false;
- size_t idx;
- for (idx = 0; idx < selections.GetCount(); idx++)
- {
- item = selections[idx];
- if (listbox->m_oldSelection.Index(item) == wxNOT_FOUND)
- {
- any_new_selected = true;
- break;
- }
- }
-
- if (any_new_selected)
- {
- // indicate that this is a selection
- event.SetExtraLong( 1 );
- listbox->m_oldSelection = selections;
- SendEvent( event, listbox, item );
- return;
- }
-
- // Now test if any new item is deselected
- bool any_new_deselected = false;
- for (idx = 0; idx < listbox->m_oldSelection.GetCount(); idx++)
- {
- item = listbox->m_oldSelection[idx];
- if (selections.Index(item) == wxNOT_FOUND)
- {
- any_new_deselected = true;
- break;
- }
- }
-
- if (any_new_deselected)
- {
- // indicate that this is a selection
- event.SetExtraLong( 0 );
- listbox->m_oldSelection = selections;
- SendEvent( event, listbox, item );
- return;
- }
-
- wxLogError( wxT("Wrong wxListBox selection") );
+ listbox->CalcAndSendEvent();
}
else
{
+ wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+ event.SetEventObject( listbox );
+
int index = listbox->GetSelection();
if (index == wxNOT_FOUND)
{
g_signal_handlers_unblock_by_func(selection,
(gpointer) gtk_listitem_changed_callback, this);
- GtkUpdateOldSelection();
+ UpdateOldSelections();
}
// ----------------------------------------------------------------------------
aSelections.Empty();
- int i = 0;
+ int i = 0;
GtkTreeIter iter;
GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
GtkEnableEvents();
}
-void wxListBox::GtkUpdateOldSelection()
-{
- if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
- GetSelections( m_oldSelection );
-}
-
void wxListBox::DoScrollToCell(int n, float alignY, float alignX)
{
wxCHECK_RET( m_treeview, wxT("invalid listbox") );