X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..8fdca65cf20ae4dba861fa6667d6e233cbb900cf:/src/gtk/listbox.cpp?ds=inline

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 734b7fa0a6..4732b2814d 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -25,7 +25,7 @@
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
-// wxListBox
+// "select" and "deselect"
 //-----------------------------------------------------------------------------
 
 static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )
@@ -57,6 +57,8 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
   if (event.m_commandString) delete[] event.m_commandString ;
 }
 
+//-----------------------------------------------------------------------------
+// wxListBox
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl)
@@ -83,11 +85,10 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
   
   m_list = GTK_LIST( gtk_list_new() );
   
-  // @@ what's the difference between BROWSE and SINGLE?
   GtkSelectionMode mode = GTK_SELECTION_BROWSE;
-  if ( style & wxLB_MULTIPLE )
+  if (style & wxLB_MULTIPLE)
     mode = GTK_SELECTION_MULTIPLE;
-  else if ( style & wxLB_EXTENDED )
+  else if (style & wxLB_EXTENDED)
     mode = GTK_SELECTION_EXTENDED;
 
   gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
@@ -95,6 +96,11 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
   gtk_container_add (GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
   gtk_widget_show( GTK_WIDGET(m_list) );
   
+  wxSize newSize = size;
+  if (newSize.x == -1) newSize.x = 100;
+  if (newSize.y == -1) newSize.y = 110;
+  SetSize( newSize.x, newSize.y );
+  
   for (int i = 0; i < n; i++)
   {
     GtkWidget *list_item;
@@ -105,7 +111,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     gtk_signal_connect( GTK_OBJECT(list_item), "select", 
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
   
-    if ( style & wxLB_MULTIPLE )
+    if (style & wxLB_MULTIPLE)
       gtk_signal_connect( GTK_OBJECT(list_item), "deselect", 
         GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
   
@@ -130,21 +136,33 @@ 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 );
   
-  if ( GetWindowStyleFlag() & wxLB_MULTIPLE )
+  if (GetWindowStyleFlag() & wxLB_MULTIPLE)
     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 );
+  
+  ConnectWidget( list_item );
+  
+  ConnectDnDWidget( list_item );
+  
 }
 
 void wxListBox::Clear(void)
@@ -156,12 +174,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 +212,7 @@ int wxListBox::FindString( const wxString &item ) const
     count++;
     child = child->next;
   }
+  wxFAIL_MSG("wrong listbox index");
   return -1;
 }
 
@@ -191,22 +220,20 @@ 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;
 }
 
 int wxListBox::GetSelection(void) const
 {
-  GList *selection = m_list->selection;
-  if (selection)
+  GList *child = m_list->children;
+  int count = 0;
+  while (child)
   {
-    GList *child = m_list->children;
-    int count = 0;
-    while (child)
-    {
-      if (child->data == selection->data) return count;
-      count++;
-      child = child->next;
-    }
+    if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) return count;
+    count++;
+    child = child->next;
   }
   return -1;
 }
@@ -216,7 +243,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 +255,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 +274,7 @@ wxString wxListBox::GetString( int n ) const
     GtkLabel *label = GTK_LABEL( bin->child );
     return label->label;
   }
+  wxFAIL_MSG("wrong listbox index");
   return "";
 }
 
@@ -257,6 +287,7 @@ wxString wxListBox::GetStringSelection(void) const
     wxString tmp = GTK_LABEL( bin->child )->label;
     return tmp;
   }
+  wxFAIL_MSG("no listbox selection available");
   return "";
 }
 
@@ -280,25 +311,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 +360,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 )
@@ -341,10 +387,58 @@ int wxListBox::GetIndex( GtkWidget *item ) const
   return -1;
 }
 
+void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
+{
+  GList *child = m_list->children;
+  while (child)
+  {
+    DisconnectDnDWidget( GTK_WIDGET( child->data ) );
+    child = child->next;
+  }
+  
+  wxWindow::SetDropTarget( dropTarget  );
+  
+  child = m_list->children;
+  while (child)
+  {
+    ConnectDnDWidget( GTK_WIDGET( child->data ) );
+    child = child->next;
+  }
+}
+
 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;
+  }
+}
+
+bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
+{
+  if (wxWindow::IsOwnGtkWindow( window )) return TRUE;
+  
+  GList *child = m_list->children;
+  while (child)
+  {
+    GtkBin *bin = (GtkBin*) child->data;
+    if (bin->child->window == window) return TRUE;
+    child = child->next;
+  }
+  
+  return FALSE;
+}