Moved print dialog data conversion code

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

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 78cf5a377ba648238ee2f25796d78b8010928401..26bc0951884dddc774ed405fe06a99f1a8b18f58 100644 (file)
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "listboxbase.h"
 #endif
 
     #pragma implementation "listboxbase.h"
 #endif
 


@@ -28,14 +28,23 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_LISTBOX
+

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

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

 #endif
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 #endif
 
 // ============================================================================
 // implementation
 // ============================================================================
 

+wxListBoxBase::~wxListBoxBase()
+{
+    // this destructor is required for Darwin
+}
+

 // ----------------------------------------------------------------------------
 // adding items
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // adding items
 // ----------------------------------------------------------------------------


@@ -70,12 +79,37 @@ void wxListBoxBase::Set(int nItems, const wxString* items, void **clientData)
 bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
 {
     int sel = FindString(s);
 bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
 {
     int sel = FindString(s);

-    wxCHECK_MSG( sel != -1, FALSE,
+    wxCHECK_MSG( sel != wxNOT_FOUND, false,

                  wxT("invalid string in SetStringSelection") );
 
     SetSelection(sel, select);
 
                  wxT("invalid string in SetStringSelection") );
 
     SetSelection(sel, 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 != wxNOT_FOUND && sel != itemToLeaveSelected )
+        {
+            Deselect(sel);
+        }
+    }

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


@@ -84,15 +118,33 @@ bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
 
 void wxListBoxBase::Command(wxCommandEvent& event)
 {
 
 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);
 

-    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::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