Commented out Robert's SetFont change for now; changed menu handling slightly

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 734b7fa0a624c4943729f84f62e3130f29dc39c6..b00f00aae13930fd0af3e32eed547ebb348b8268 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -130,8 +130,15 @@ void wxListBox::Append( const wxString &item )
 
 void wxListBox::Append( const wxString &item, char *clientData )
 {
-  GtkWidget *list_item;
-  list_item = gtk_list_item_new_with_label( item ); 
+  GtkWidget *list_item = gtk_list_item_new_with_label( item ); 
+  
+  if (m_hasOwnStyle)
+  {
+    GtkBin *bin = GTK_BIN( list_item );
+    gtk_widget_set_style( bin->child, 
+      gtk_style_ref(
+        gtk_widget_get_style( m_widget ) ) ); 
+  }
   
   gtk_signal_connect( GTK_OBJECT(list_item), "select", 
     GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
@@ -140,10 +147,10 @@ void wxListBox::Append( const wxString &item, char *clientData )
     gtk_signal_connect( GTK_OBJECT(list_item), "deselect", 
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
   
-  gtk_container_add( GTK_CONTAINER(m_list), list_item );
-  
   m_clientData.Append( (wxObject*)clientData );
   
+  gtk_container_add( GTK_CONTAINER(m_list), list_item );
+  
   gtk_widget_show( list_item );
 }
 
@@ -156,12 +163,22 @@ void wxListBox::Clear(void)
 
 void wxListBox::Delete( int n )
 {
-  gtk_list_clear_items( m_list, n, n );
+  GList *child = g_list_nth( m_list->children, n );
+  
+  if (!child)
+  {
+    wxFAIL_MSG("wrong listbox index");
+    return;
+  }
+  
+  GList *list = g_list_append( NULL, child->data );
+  gtk_list_remove_items( m_list, list );
+  g_list_free( list );
   
   wxNode *node = m_clientData.Nth( n );
   if (!node)
   {
-    wxFAIL_MSG("wxListBox::Delete wrong index");
+    wxFAIL_MSG("wrong listbox index");
   }
   else
     m_clientData.DeleteNode( node );
@@ -184,6 +201,7 @@ int wxListBox::FindString( const wxString &item ) const
     count++;
     child = child->next;
   }
+  wxFAIL_MSG("wrong listbox index");
   return -1;
 }
 
@@ -191,6 +209,8 @@ char *wxListBox::GetClientData( int n ) const
 {
   wxNode *node = m_clientData.Nth( n );
   if (node) return ((char*)node->Data());
+  
+  wxFAIL_MSG("wrong listbox index");
   return (char *) NULL;
 }
 
@@ -208,6 +228,7 @@ int wxListBox::GetSelection(void) const
       child = child->next;
     }
   }
+  wxFAIL_MSG("wrong listbox index");
   return -1;
 }
 
@@ -216,7 +237,8 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
   // 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 ) {
+  for ( child = m_list->children; child != NULL; child = child->next ) 
+  {
     if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) 
       count++;
   }
@@ -227,7 +249,8 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
     // now fill the list
     aSelections.Alloc(count); // optimization attempt
     int i = 0;
-    for ( child = m_list->children; child != NULL; child = child->next, i++ ) {
+    for ( child = m_list->children; child != NULL; child = child->next, i++ ) 
+    {
       if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) 
         aSelections.Add(i);
     }
@@ -245,6 +268,7 @@ wxString wxListBox::GetString( int n ) const
     GtkLabel *label = GTK_LABEL( bin->child );
     return label->label;
   }
+  wxFAIL_MSG("wrong listbox index");
   return "";
 }
 
@@ -257,6 +281,7 @@ wxString wxListBox::GetStringSelection(void) const
     wxString tmp = GTK_LABEL( bin->child )->label;
     return tmp;
   }
+  wxFAIL_MSG("no listbox selection available");
   return "";
 }
 
@@ -280,25 +305,36 @@ bool wxListBox::Selected( int n )
       child = child->next;
     }
   }
+  wxFAIL_MSG("wrong listbox index");
   return FALSE;
 }
 
 void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
 {
+  wxFAIL_MSG("wxListBox::Set not implemented");
 }
 
 void wxListBox::SetClientData( int n, char *clientData )
 {
   wxNode *node = m_clientData.Nth( n );
-  if (node) node->SetData( (wxObject*)clientData );
+  if (node)
+  { 
+    node->SetData( (wxObject*)clientData );
+  }
+  else
+  {
+    wxFAIL_MSG("wrong listbox index");
+  }
 }
 
 void wxListBox::SetFirstItem( int WXUNUSED(n) )
 {
+  wxFAIL_MSG("wxListBox::SetFirstItem not implemented");
 }
 
 void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
 {
+  wxFAIL_MSG("wxListBox::SetFirstItem not implemented");
 }
 
 void wxListBox::SetSelection( int n, bool select )
@@ -318,6 +354,10 @@ void wxListBox::SetString( int n, const wxString &string )
     GtkLabel *label = GTK_LABEL( bin->child );
     gtk_label_set( label, string );
   }
+  else
+  {
+    wxFAIL_MSG("wrong listbox index");
+  }
 }
 
 void wxListBox::SetStringSelection( const wxString &string, bool select )
@@ -346,5 +386,19 @@ GtkWidget *wxListBox::GetConnectWidget(void)
   return GTK_WIDGET(m_list);
 }
 
+void wxListBox::SetFont( const wxFont &font )
+{
+  wxWindow::SetFont( font );
+   
+  GList *child = m_list->children;
+  while (child)
+  {
+    GtkBin *bin = (GtkBin*) child->data;
+    gtk_widget_set_style( bin->child, 
+      gtk_style_ref(
+        gtk_widget_get_style( m_widget ) ) ); 
+    child = child->next;
+  }
+}