Preserve original menu label for later retrieval

[wxWidgets.git] / src / gtk1 / listbox.cpp

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 38eee5c8d36693b0edbb5ff1d47022d15e561c19..93815ed498c7e74d37900ab990322024a9e59619 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -19,10 +19,10 @@
     #include "wx/intl.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/utils.h"
     #include "wx/settings.h"

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

 #endif
 
 #endif
 

-#include "wx/arrstr.h"
-#include "wx/checklst.h"

 #include "wx/gtk1/private.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/gtk1/private.h"
 
 #if wxUSE_TOOLTIPS


@@ -541,7 +541,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     if ( style & wxLB_SORT )
     {
 
     if ( style & wxLB_SORT )
     {

-        // this will change DoAppend() behaviour
+        // this will change Append() behaviour

         m_strings = new wxSortedArrayString;
     }
     else
         m_strings = new wxSortedArrayString;
     }
     else


@@ -549,16 +549,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         m_strings = (wxSortedArrayString *)NULL;
     }
 
         m_strings = (wxSortedArrayString *)NULL;
     }
 

-    for (int i = 0; i < n; i++)
-    {
-        // add one by one
-        DoAppend(choices[i]);
-    }
+    Append(n, choices);

 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 
     m_parent->DoAddChild( this );
 
     PostCreation(size);

-    SetBestSize(size); // need this too because this is a wxControlWithItems
+    SetInitialSize(size); // need this too because this is a wxControlWithItems

 
     return true;
 }
 
     return true;
 }


@@ -577,101 +573,44 @@ wxListBox::~wxListBox()
 // adding items
 // ----------------------------------------------------------------------------
 
 // adding items
 // ----------------------------------------------------------------------------
 

-void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                             unsigned int pos,
+                             void **clientData,
+                             wxClientDataType type)

 {
 {

-    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, wxT("invalid listbox") );

 
 

-    // VZ: notice that InsertItems knows nothing about sorting, so calling it
-    //     from outside (and not from our own Append) is likely to break
-    //     everything
+    const unsigned count = GetCount();
+    wxCHECK_MSG( pos <= count, wxNOT_FOUND,
+                    wxT("invalid index in wxListBox::InsertItems") );

 
     // code elsewhere supposes we have as many items in m_clientList as items
     // in the listbox
 
     // code elsewhere supposes we have as many items in m_clientList as items
     // in the listbox

-    wxASSERT_MSG( m_clientList.GetCount() == GetCount(),
-                  wxT("bug in client data management") );
+    wxASSERT_MSG( m_clientList.GetCount() == count,
+                      wxT("bug in client data management") );

 
     InvalidateBestSize();
 
 
     InvalidateBestSize();
 

-    GList *children = m_list->children;
-    unsigned int length = g_list_length(children);
-
-    wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );
+    const unsigned numItems = items.GetCount();

 
 

-    unsigned int nItems = items.GetCount();
-    int index;
-
-    if (m_strings)
+    for ( unsigned int n = 0; n < numItems; ++n, ++pos )

     {
     {

-        for (unsigned int n = 0; n < nItems; n++)
-        {
-            index = m_strings->Add( items[n] );
+        const wxString& item = items[n];

 
 

-            if (index != (int)GetCount())
-            {
-                GtkAddItem( items[n], index );
-                wxList::compatibility_iterator node = m_clientList.Item( index );
-                m_clientList.Insert( node, (wxObject*) NULL );
-            }
-            else
-            {
-                GtkAddItem( items[n] );
-                m_clientList.Append( (wxObject*) NULL );
-            }
-        }
-    }
-    else
-    {
-        if (pos == length)
-        {
-            for ( unsigned int n = 0; n < nItems; n++ )
-            {
-                GtkAddItem( items[n] );
+        const unsigned idx = m_strings ? m_strings->Add(item)
+                                       : pos;

 
 

-                m_clientList.Append((wxObject *)NULL);
-            }
-        }
-        else
-        {
-            wxList::compatibility_iterator node = m_clientList.Item( pos );
-            for ( unsigned int n = 0; n < nItems; n++ )
-            {
-                GtkAddItem( items[n], pos+n );
+        GtkAddItem(item, idx == GetCount() ? -1 : idx);

 
 

-                m_clientList.Insert( node, (wxObject *)NULL );
-            }
-        }
+        m_clientList.Insert(idx, NULL);
+
+        AssignNewItemClientData(idx, clientData, n, type);

     }
 
     wxASSERT_MSG( m_clientList.GetCount() == GetCount(),
                       wxT("bug in client data management") );
     }
 
     wxASSERT_MSG( m_clientList.GetCount() == GetCount(),
                       wxT("bug in client data management") );

-}
-
-int wxListBox::DoAppend( const wxString& item )
-{
-    InvalidateBestSize();
-
-    if (m_strings)
-    {
-        // need to determine the index
-        int index = m_strings->Add( item );
-
-        // only if not at the end anyway
-        if (index != (int)GetCount())
-        {
-           GtkAddItem( item, index );
-
-           wxList::compatibility_iterator node = m_clientList.Item( index );
-           m_clientList.Insert( node, (wxObject *)NULL );
-
-           return index;
-        }
-    }
-
-    GtkAddItem(item);

 
 

-    m_clientList.Append((wxObject *)NULL);
-
-    return GetCount() - 1;
+    return pos - 1;

 }
 
 void wxListBox::GtkAddItem( const wxString &item, int pos )
 }
 
 void wxListBox::GtkAddItem( const wxString &item, int pos )


@@ -752,28 +691,11 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
     }
 }
 
     }
 }
 

-void wxListBox::DoSetItems( const wxArrayString& items,
-                            void **clientData)
-{
-    Clear();
-
-    DoInsertItems(items, 0);
-
-    if ( clientData )
-    {
-        unsigned int count = items.GetCount();
-        for ( unsigned int n = 0; n < count; n++ )
-        {
-            SetClientData(n, clientData[n]);
-        }
-    }
-}
-

 // ----------------------------------------------------------------------------
 // deleting items
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // deleting items
 // ----------------------------------------------------------------------------
 

-void wxListBox::Clear()
+void wxListBox::DoClear()

 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 


@@ -785,25 +707,13 @@ void wxListBox::Clear()
         GTK_LIST(m_list)->last_focus_child = NULL;
     }
 
         GTK_LIST(m_list)->last_focus_child = NULL;
     }
 

-    if ( HasClientObjectData() )
-    {
-        // destroy the data (due to Robert's idea of using wxList<wxObject>
-        // and not wxList<wxClientData> we can't just say
-        // m_clientList.DeleteContents(true) - this would crash!
-        wxList::compatibility_iterator node = m_clientList.GetFirst();
-        while ( node )
-        {
-            delete (wxClientData *)node->GetData();
-            node = node->GetNext();
-        }
-    }

     m_clientList.Clear();
 
     if ( m_strings )
         m_strings->Clear();
 }
 
     m_clientList.Clear();
 
     if ( m_strings )
         m_strings->Clear();
 }
 

-void wxListBox::Delete(unsigned int n)
+void wxListBox::DoDeleteOneItem(unsigned int n)

 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 


@@ -818,12 +728,6 @@ void wxListBox::Delete(unsigned int n)
     wxList::compatibility_iterator node = m_clientList.Item( n );
     if ( node )
     {
     wxList::compatibility_iterator node = m_clientList.Item( n );
     if ( node )
     {

-        if ( m_clientDataItemsType == wxClientData_Object )
-        {
-            wxClientData *cd = (wxClientData*)node->GetData();
-            delete cd;
-        }
-

         m_clientList.Erase( node );
     }
 
         m_clientList.Erase( node );
     }
 


@@ -855,29 +759,6 @@ void* wxListBox::DoGetItemClientData(unsigned int n) const
     return node->GetData();
 }
 
     return node->GetData();
 }
 

-void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
-
-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );
-
-    // wxItemContainer already deletes data for us
-
-    node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
-
-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_MSG( node, (wxClientData *)NULL,
-                 wxT("invalid index in wxListBox::DoGetItemClientObject") );
-
-    return (wxClientData*) node->GetData();
-}
-

 // ----------------------------------------------------------------------------
 // string list access
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // string list access
 // ----------------------------------------------------------------------------


@@ -976,7 +857,7 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const
 
 int wxListBox::GetSelection() const
 {
 
 int wxListBox::GetSelection() const
 {

-    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, wxT("invalid listbox") );

 
     GList *child = m_list->children;
     int count = 0;
 
     GList *child = m_list->children;
     int count = 0;


@@ -986,12 +867,12 @@ int wxListBox::GetSelection() const
         count++;
         child = child->next;
     }
         count++;
         child = child->next;
     }

-    return -1;
+    return wxNOT_FOUND;

 }
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {
 }
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {

-    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, wxT("invalid listbox") );

 
     // get the number of selected items first
     GList *child = m_list->children;
 
     // get the number of selected items first
     GList *child = m_list->children;