Make events match better with MSW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 6045226d542c371bcf4613ed16a88619e12de808..7fbd69425fe03cb4b0d345d4c0d611ae5cac5859 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -126,25 +126,97 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
     {
         wxArrayInt selections;
         listbox->GetSelections( selections );
     {
         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 );
 
         if (selections.GetCount() == 0)
         {
             // indicate that this is a deselection
             event.SetExtraLong( 0 );

-            event.SetInt( -1 );
+            
+            // take first item in old selection
+            event.SetInt( listbox->m_oldSelection[0] );
+            event.SetString( listbox->GetString( listbox->m_oldSelection[0] ) );
+            
+            listbox->m_oldSelection = selections;

 
             listbox->HandleWindowEvent( event );
 
             return;
         }
 
             listbox->HandleWindowEvent( event );
 
             return;
         }

-        else
+        
+        // Now test if any new item is selected
+        bool any_new_selected = false;
+        size_t idx;
+        for (idx = 0; idx < selections.GetCount(); idx++)
+        {
+            int item = selections[idx];
+            if (listbox->m_oldSelection.Index(item) == wxNOT_FOUND)
+            {
+                event.SetInt( item );
+                event.SetString( listbox->GetString( item ) );
+                any_new_selected = true;
+                break;
+            }
+        }
+        
+        if (any_new_selected)

         {
             // indicate that this is a selection
             event.SetExtraLong( 1 );
         {
             // indicate that this is a selection
             event.SetExtraLong( 1 );

-            event.SetInt( selections[0] );

 
 

+            listbox->m_oldSelection = selections;
+            listbox->HandleWindowEvent( event );
+            return;
+        }
+        
+        // Now test if any new item is deselected
+        bool any_new_deselected = false;
+        for (idx = 0; idx < listbox->m_oldSelection.GetCount(); idx++)
+        {
+            int item = listbox->m_oldSelection[idx];
+            if (selections.Index(item) == wxNOT_FOUND)
+            {
+                event.SetInt( item );
+                event.SetString( listbox->GetString( item ) );
+                any_new_deselected = true;
+                break;
+            }
+        }
+        
+        if (any_new_deselected)
+        {
+            // indicate that this is a selection
+            event.SetExtraLong( 0 );
+
+            listbox->m_oldSelection = selections;

             listbox->HandleWindowEvent( event );
             listbox->HandleWindowEvent( event );

+            return;

         }
         }

+        
+        wxLogError( wxT("Wrong wxListBox selection") );

     }
     else
     {
     }
     else
     {


@@ -842,7 +914,7 @@ void wxListBox::DoSetSelection( int n, bool select )
 
 void wxListBox::GtkUpdateOldSelection()
 {
 
 void wxListBox::GtkUpdateOldSelection()
 {

-    if (HasFlag(wxLB_MULTIPLE))
+    if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))

         GetSelections( m_oldSelection );
 }
 
         GetSelections( m_oldSelection );
 }