X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ee9d6182c9b7774477e97f4326766ac05cc70c2..2d7388d3e86cc692fb576902f71618c87d7e4b9c:/src/common/lboxcmn.cpp

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 642b324e9b..dfd4b69564 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"
 
@@ -28,54 +24,170 @@
     #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
-// ----------------------------------------------------------------------------
-
-bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
+void wxListBoxBase::UpdateOldSelections()
 {
-    int sel = FindString(s);
-    wxCHECK_MSG( sel != -1, FALSE,
-                 wxT("invalid string in SetStringSelection") );
+    if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
+        GetSelections( m_oldSelections );
+}
 
-    SetSelection(sel, select);
+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 );
+}
 
-    return TRUE;
+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") );
 }
 
 // ----------------------------------------------------------------------------
@@ -84,15 +196,33 @@ bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
 
 void wxListBoxBase::Command(wxCommandEvent& event)
 {
-    SetSelection(event.m_commandInt, event.m_extraLong != 0);
+    SetSelection(event.GetInt(), event.GetExtraLong() != 0);
     (void)ProcessEvent(event);
 }
 
+// ----------------------------------------------------------------------------
+// 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::AppendAndEnsureVisible(const wxString& s)
+{
+    Append(s);
+    EnsureVisible(GetCount() - 1);
+}
+
+void wxListBoxBase::EnsureVisible(int WXUNUSED(n))
+{
+    // the base class version does nothing (the only alternative would be to
+    // call SetFirstItem() but this is probably even more stupid)
+}
+
+#endif // wxUSE_LISTBOX