X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ee3ee1bc8ac2f95029835ebc115fac0a1fbd02a..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/common/lboxcmn.cpp?ds=sidebyside

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 8525ef8104..218ba8a71a 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,22 +24,32 @@
     #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
 
 // ============================================================================
 // implementation
 // ============================================================================
 
+wxListBoxBase::~wxListBoxBase()
+{
+    // this destructor is required for Darwin
+}
+
 // ----------------------------------------------------------------------------
 // adding items
 // ----------------------------------------------------------------------------
 
-void wxListBoxBase::InsertItems(int nItems, const wxString *items, int pos)
+void wxListBoxBase::InsertItems(unsigned int nItems, const wxString *items, unsigned int pos)
 {
     wxArrayString aItems;
-    for ( int n = 0; n < nItems; n++ )
+    for ( unsigned int n = 0; n < nItems; n++ )
     {
         aItems.Add(items[n]);
     }
@@ -67,85 +73,75 @@ void wxListBoxBase::Set(int nItems, const wxString* items, void **clientData)
 // selection
 // ----------------------------------------------------------------------------
 
-wxString wxListBoxBase::GetStringSelection () const
-{
-    wxString s;
-    int sel = GetSelection();
-    if ( sel != -1 )
-        s = GetString(sel);
-
-    return s;
-}
-
 bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
 {
-    int sel = FindString(s);
-    wxCHECK_MSG( sel != -1, FALSE,
-                 wxT("invalid string in wxListBox::SetStringSelection") );
+    const int sel = FindString(s);
+    if ( sel == wxNOT_FOUND )
+        return false;
 
     SetSelection(sel, select);
 
-    return TRUE;
-}
-
-// ----------------------------------------------------------------------------
-// client data
-// ----------------------------------------------------------------------------
-
-void wxListBoxBase::SetClientObject(int n, wxClientData *data)
-{
-    wxASSERT_MSG( m_clientDataItemsType != ClientData_Void,
-                  wxT("can't have both object and void client data") );
-
-    wxClientData *clientDataOld = DoGetClientObject(n);
-    if ( clientDataOld )
-        delete clientDataOld;
-
-    DoSetClientObject(n, data);
-    m_clientDataItemsType = ClientData_Object;
+    return true;
 }
 
-wxClientData *wxListBoxBase::GetClientObject(int n) const
+void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
 {
-    wxASSERT_MSG( m_clientDataItemsType == ClientData_Object,
-                  wxT("this window doesn't have object client data") );
-
-    return DoGetClientObject(n);
+    if ( HasMultipleSelection() )
+    {
+        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);
+        }
+    }
 }
 
-void wxListBoxBase::SetClientData(int n, void *data)
-{
-    wxASSERT_MSG( m_clientDataItemsType != ClientData_Object,
-                  wxT("can't have both object and void client data") );
-
-    DoSetClientData(n, data);
-    m_clientDataItemsType = ClientData_Void;
-}
+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------
 
-void *wxListBoxBase::GetClientData(int n) const
+void wxListBoxBase::Command(wxCommandEvent& event)
 {
-    wxASSERT_MSG( m_clientDataItemsType == ClientData_Void,
-                  wxT("this window doesn't have void client data") );
-
-    return DoGetClientData(n);
+    SetSelection(event.GetInt(), event.GetExtraLong() != 0);
+    (void)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)
 {
-    SetSelection(event.m_commandInt, event.m_extraLong);
-    (void)ProcessEvent(event);
+    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