Cleared up DEBUG define mess, defines are now called __WXDEBUG__ and WXDEBUG.

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 37dd67fef3475ee6640c2d222cd3dd3babac3ad3..58842aa9c50b6d3f5e6cacc58ab5b0b7ab6e4c68 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/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) );
@@ -108,6 +117,7 @@ void wxListBox::Append( const wxString &item )
 
 void wxListBox::Append( const wxString &WXUNUSED(item), char *WXUNUSED(clientData) )
 {
+  wxFAIL_MSG("wxListBox::Append(clientdata) not implemented");
 };
 
 void wxListBox::Clear(void)
@@ -140,8 +150,10 @@ int wxListBox::FindString( const wxString &item ) const
   return -1;
 };
 
-char *wxListBox::GetClientData( const int WXUNUSED(n) ) const
+char *wxListBox::GetClientData( int WXUNUSED(n) ) const
 {
+  wxFAIL_MSG("wxListBox::GetClientData not implemented");
+
   return NULL;
 };
 
@@ -162,9 +174,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 +231,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,11 +246,11 @@ 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 WXUNUSED(n), char *WXUNUSED(clientData) )
 {
 };
 
@@ -230,7 +262,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 +270,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 );
 };