fixed bug with redoing the command when there was nothing to redo

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

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 78cf5a377ba648238ee2f25796d78b8010928401..39e70a027c6028d12aa1ce7f2961aadb227ea6d5 100644 (file)
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_LISTBOX
+

 #ifndef WX_PRECOMP
     #include "wx/listbox.h"
 #endif
 #ifndef WX_PRECOMP
     #include "wx/listbox.h"
 #endif


@@ -78,16 +80,45 @@ bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
     return TRUE;
 }
 
     return TRUE;
 }
 

+void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
+{
+    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 != -1 && sel != itemToLeaveSelected )
+        {
+            Deselect(sel);
+        }
+    }
+}
+

 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 
 void wxListBoxBase::Command(wxCommandEvent& event)
 {
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 
 void wxListBoxBase::Command(wxCommandEvent& event)
 {

-    SetSelection(event.m_commandInt, event.m_extraLong);
+    SetSelection(event.m_commandInt, event.m_extraLong != 0);

     (void)ProcessEvent(event);
 }
 
     (void)ProcessEvent(event);
 }
 

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

 void wxListBoxBase::SetFirstItem(const wxString& s)
 {
     int n = FindString(s);
 void wxListBoxBase::SetFirstItem(const wxString& s)
 {
     int n = FindString(s);


@@ -96,3 +127,17 @@ void wxListBoxBase::SetFirstItem(const wxString& s)
 
     DoSetFirstItem(n);
 }
 
     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