handle correctly never/always shown scrollbars in GetClientSize()

[wxWidgets.git] / src / common / lboxcmn.cpp

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 8525ef810466f31e9d7805180e744611618529d8..9b114d7c1b56152b7ee95846548cf64106444c56 100644 (file)
--- 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$
 // 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
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "listboxbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,124 +24,209 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_LISTBOX
+
+#include "wx/listbox.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/listbox.h"
+    #include "wx/dynarray.h"
+    #include "wx/arrstr.h"

 #endif
 
 #endif
 

+#include "wx/log.h"
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // 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
-// ----------------------------------------------------------------------------
-
-wxString wxListBoxBase::GetStringSelection () const
+void wxListBoxBase::UpdateOldSelections()

 {
 {

-    wxString s;
-    int sel = GetSelection();
-    if ( sel != -1 )
-        s = GetString(sel);
-
-    return s;
+    if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
+        GetSelections( m_oldSelections );

 }
 
 }
 

-bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
+static void LBSendEvent( wxCommandEvent &event, wxListBoxBase *listbox, int item )

 {
 {

-    int sel = FindString(s);
-    wxCHECK_MSG( sel != -1, FALSE,
-                 wxT("invalid string in wxListBox::SetStringSelection") );
-
-    SetSelection(sel, select);
-
-    return TRUE;
+    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 );

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// client data
-// ----------------------------------------------------------------------------
-
-void wxListBoxBase::SetClientObject(int n, wxClientData *data)
+void wxListBoxBase::CalcAndSendEvent()

 {
 {

-    wxASSERT_MSG( m_clientDataItemsType != ClientData_Void,
-                  wxT("can't have both object and void client data") );
+    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());
+    event.SetEventObject( this );

 
 

-    wxClientData *clientDataOld = DoGetClientObject(n);
-    if ( clientDataOld )
-        delete clientDataOld;
+    wxArrayInt selections;
+    GetSelections(selections);

 
 

-    DoSetClientObject(n, data);
-    m_clientDataItemsType = ClientData_Object;
-}
+    if ( selections.empty() && m_oldSelections.empty() )
+    {
+        // nothing changed, just leave
+        return;
+    }

 
 

-wxClientData *wxListBoxBase::GetClientObject(int n) const
-{
-    wxASSERT_MSG( m_clientDataItemsType == ClientData_Object,
-                  wxT("this window doesn't have object client data") );
+    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;
+    }

 
 

-    return DoGetClientObject(n);
-}
+    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
+            }
+        }
+    }

 
 

-void wxListBoxBase::SetClientData(int n, void *data)
-{
-    wxASSERT_MSG( m_clientDataItemsType != ClientData_Object,
-                  wxT("can't have both object and void client data") );
+    wxASSERT_MSG( item != wxNOT_FOUND,
+                  "Logic error in wxListBox selection event generation code" );
+
+    m_oldSelections = selections;

 
 

-    DoSetClientData(n, data);
-    m_clientDataItemsType = ClientData_Void;
+    LBSendEvent(event, this, item);

 }
 
 }
 

-void *wxListBoxBase::GetClientData(int n) const
-{
-    wxASSERT_MSG( m_clientDataItemsType == ClientData_Void,
-                  wxT("this window doesn't have void client data") );
+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------

 
 

-    return DoGetClientData(n);
+void wxListBoxBase::Command(wxCommandEvent& event)
+{
+    SetSelection(event.GetInt(), event.GetExtraLong() != 0);
+    (void)ProcessEvent(event);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// misc
+// SetFirstItem() and such

 // ----------------------------------------------------------------------------
 
 void wxListBoxBase::SetFirstItem(const wxString& s)
 {
     int n = FindString(s);
 
 // ----------------------------------------------------------------------------
 
 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);
 }
 
 
     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