New toolbar event processing

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 37dd67fef3475ee6640c2d222cd3dd3babac3ad3..aca47629374b5b40c848b2f507099c2ea8f273d7 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -13,6 +13,7 @@
 #pragma implementation "listbox.h"
 #endif
 
+#include "wx/dynarray.h"
 #include "wx/listbox.h"
 
 //-----------------------------------------------------------------------------
@@ -48,16 +49,16 @@ wxListBox::wxListBox(void)
 
 wxListBox::wxListBox( wxWindow *parent, wxWindowID id, 
       const wxPoint &pos, const wxSize &size, 
-      const int n, const wxString choices[],
-      const long style, const wxString &name )
+      int n, const wxString choices[],
+      long style, const wxString &name )
 {
   Create( parent, id, pos, size, n, choices, style, name );
 };
 
 bool wxListBox::Create( wxWindow *parent, wxWindowID id, 
       const wxPoint &pos, const wxSize &size, 
-      const int n, const wxString choices[],
-      const long style, const wxString &name )
+      int n, const wxString choices[],
+      long style, const wxString &name )
 {
   m_needParent = TRUE;
   
@@ -68,7 +69,15 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
   
   m_list = GTK_LIST( gtk_list_new() );
-  gtk_list_set_selection_mode( GTK_LIST(m_list), GTK_SELECTION_BROWSE );
+  
+  // @@ what's the difference between BROWSE and SINGLE?
+  GtkSelectionMode mode = GTK_SELECTION_BROWSE;
+  if ( style & wxLB_MULTIPLE )
+    mode = GTK_SELECTION_MULTIPLE;
+  else if ( style & wxLB_EXTENDED )
+    mode = GTK_SELECTION_EXTENDED;
+
+  gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
   
   gtk_container_add (GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
   gtk_widget_show( GTK_WIDGET(m_list) );
@@ -83,6 +92,8 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
   
     gtk_container_add( GTK_CONTAINER(m_list), list_item );
     
+    m_clientData.Append( (wxObject*)NULL );
+    
     gtk_widget_show( list_item );
   };
  
@@ -103,21 +114,44 @@ void wxListBox::Append( const wxString &item )
   
   gtk_container_add( GTK_CONTAINER(m_list), list_item );
     
+  m_clientData.Append( (wxObject*)NULL );
+  
   gtk_widget_show( list_item );
 };
 
-void wxListBox::Append( const wxString &WXUNUSED(item), char *WXUNUSED(clientData) )
+void wxListBox::Append( const wxString &item, char *clientData )
 {
+  GtkWidget *list_item;
+  list_item = gtk_list_item_new_with_label( item ); 
+  
+ gtk_signal_connect( GTK_OBJECT(list_item), "select", 
+    GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+  
+  gtk_container_add( GTK_CONTAINER(m_list), list_item );
+  
+  m_clientData.Append( (wxObject*)clientData );
+  
+  gtk_widget_show( list_item );
 };
 
 void wxListBox::Clear(void)
 {
   gtk_list_clear_items( m_list, 0, Number() );
+  
+  m_clientData.Clear();
 };
 
 void wxListBox::Delete( int n )
 {
   gtk_list_clear_items( m_list, n, n );
+  
+  wxNode *node = m_clientData.Nth( n );
+  if (!node)
+  {
+    wxFAIL_MSG("wxListBox::Delete wrong index");
+  }
+  else
+    m_clientData.DeleteNode( node );
 };
 
 void wxListBox::Deselect( int n )
@@ -140,8 +174,10 @@ int wxListBox::FindString( const wxString &item ) const
   return -1;
 };
 
-char *wxListBox::GetClientData( const int WXUNUSED(n) ) const
+char *wxListBox::GetClientData( int n ) const
 {
+  wxNode *node = m_clientData.Nth( n );
+  if (node) return ((char*)node->Data());
   return NULL;
 };
 
@@ -162,9 +198,29 @@ int wxListBox::GetSelection(void) const
   return -1;
 };
 
-int wxListBox::GetSelections( int **WXUNUSED(selections) ) const
+int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
-  return 0;
+  // get the number of selected items first
+  GList *child = m_list->children;
+  int count = 0;
+  for ( child = m_list->children; child != NULL; child = child->next ) {
+    if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) 
+      count++;
+  }
+
+  aSelections.Empty();
+  
+  if ( count > 0 ) {
+    // now fill the list
+    aSelections.Alloc(count); // optimization attempt
+    int i = 0;
+    for ( child = m_list->children; child != NULL; child = child->next, i++ ) {
+      if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) 
+        aSelections.Add(i);
+    }
+  }
+  
+  return count;
 };
 
 wxString wxListBox::GetString( int n ) const
@@ -199,7 +255,7 @@ int wxListBox::Number(void)
   return count;
 };
 
-bool wxListBox::Selected( const int n )
+bool wxListBox::Selected( int n )
 {
   GList *target = g_list_nth( m_list->children, n );
   if (target)
@@ -214,12 +270,14 @@ bool wxListBox::Selected( const int n )
   return FALSE;
 };
 
-void wxListBox::Set( const int WXUNUSED(n), const wxString *WXUNUSED(choices) )
+void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
 {
 };
 
-void wxListBox::SetClientData( const int WXUNUSED(n), char *WXUNUSED(clientData) )
+void wxListBox::SetClientData( int n, char *clientData )
 {
+  wxNode *node = m_clientData.Nth( n );
+  if (node) node->SetData( (wxObject*)clientData );
 };
 
 void wxListBox::SetFirstItem( int WXUNUSED(n) )
@@ -230,7 +288,7 @@ void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
 {
 };
 
-void wxListBox::SetSelection( const int n, const bool select )
+void wxListBox::SetSelection( int n, bool select )
 {
   if (select)
     gtk_list_select_item( m_list, n );
@@ -238,11 +296,11 @@ void wxListBox::SetSelection( const int n, const bool select )
     gtk_list_unselect_item( m_list, n );
 };
 
-void wxListBox::SetString( const int WXUNUSED(n), const wxString &WXUNUSED(string) )
+void wxListBox::SetString( int WXUNUSED(n), const wxString &WXUNUSED(string) )
 {
 };
 
-void wxListBox::SetStringSelection( const wxString &string, const bool select )
+void wxListBox::SetStringSelection( const wxString &string, bool select )
 {
   SetSelection( FindString(string), select );
 };