X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9711a4deb97504db860a136df11077fbc56eeee..c1099d92544fb97cb230248e50cf0c81a2633cdd:/src/common/lboxcmn.cpp

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 671c54c39a..a9beae01cc 100644
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
-// 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
+// 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"
 
@@ -30,12 +26,15 @@
 
 #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
 // ============================================================================
@@ -45,46 +44,19 @@ wxListBoxBase::~wxListBoxBase()
     // this destructor is required for Darwin
 }
 
-// ----------------------------------------------------------------------------
-// adding items
-// ----------------------------------------------------------------------------
-
-void wxListBoxBase::InsertItems(int nItems, const wxString *items, int pos)
-{
-    wxArrayString aItems;
-    for ( int n = 0; n < nItems; n++ )
-    {
-        aItems.Add(items[n]);
-    }
-
-    DoInsertItems(aItems, pos);
-}
-
-
-void wxListBoxBase::Set(int nItems, const wxString* items, void **clientData)
-{
-    wxArrayString aItems;
-    for ( int n = 0; n < nItems; n++ )
-    {
-        aItems.Add(items[n]);
-    }
-
-    DoSetItems(aItems, clientData);
-}
-
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
 
 bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
 {
-    int sel = FindString(s);
-    wxCHECK_MSG( sel != -1, FALSE,
-                 wxT("invalid string in SetStringSelection") );
+    const int sel = FindString(s);
+    if ( sel == wxNOT_FOUND )
+        return false;
 
     SetSelection(sel, select);
 
-    return TRUE;
+    return true;
 }
 
 void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
@@ -105,21 +77,131 @@ void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
     else // single selection
     {
         int sel = GetSelection();
-        if ( sel != -1 && sel != itemToLeaveSelected )
+        if ( sel != wxNOT_FOUND && sel != itemToLeaveSelected )
         {
             Deselect(sel);
         }
     }
 }
 
+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.empty() && m_oldSelections.empty() )
+    {
+        // nothing changed, just leave
+        return;
+    }
+
+    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;
+    }
+
+    int item = wxNOT_FOUND;
+    if ( selections.empty() )
+    {
+        // indicate that this is a deselection
+        event.SetExtraLong(0);
+        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 )
+        {
+            // indicate that this is a selection
+            event.SetExtraLong(1);
+        }
+        else // 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
+                event.SetExtraLong(0);
+            }
+            else
+            {
+                item = wxNOT_FOUND; // this should be impossible
+            }
+        }
+    }
+
+    wxASSERT_MSG( item != wxNOT_FOUND,
+                  "Logic error in wxListBox selection event generation code" );
+
+    m_oldSelections = selections;
+
+    LBSendEvent(event, this, item);
+}
+
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 
 void wxListBoxBase::Command(wxCommandEvent& event)
 {
-    SetSelection(event.m_commandInt, event.m_extraLong != 0);
-    (void)ProcessEvent(event);
+    SetSelection(event.GetInt(), event.GetExtraLong() != 0);
+    (void)GetEventHandler()->ProcessEvent(event);
 }
 
 // ----------------------------------------------------------------------------
@@ -130,7 +212,7 @@ 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);
 }