compilation problem under Windows fixed (Karsten, you should use a cast when

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 58842aa9c50b6d3f5e6cacc58ab5b0b7ab6e4c68..e4f05dc807276336b2790ab9d5f22dc54708e135 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -16,14 +16,21 @@
 #include "wx/dynarray.h"
 #include "wx/listbox.h"
 
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+
 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------
 
-void gtk_listitem_select_callback( GtkWidget *widget, gpointer data )
+static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox )
 {
-  wxListBox *listbox = (wxListBox*)data;
-
+  if (!listbox->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
+  
   wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
   
   event.SetInt( listbox->GetIndex( widget ) );
@@ -32,10 +39,9 @@ void gtk_listitem_select_callback( GtkWidget *widget, gpointer data )
   GtkLabel *label = GTK_LABEL( bin->child );
   wxString tmp( label->label );
   event.SetString( WXSTRINGCAST(tmp) );
-  
   event.SetEventObject( listbox );
   
-  listbox->ProcessEvent( event );
+  listbox->GetEventHandler()->ProcessEvent( event );
 };
 
 //-----------------------------------------------------------------------------
@@ -87,16 +93,20 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     GtkWidget *list_item;
     list_item = gtk_list_item_new_with_label( choices[i] ); 
   
+    gtk_container_add( GTK_CONTAINER(m_list), list_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*)NULL );
     
     gtk_widget_show( list_item );
   };
  
   PostCreation();
   
+  gtk_widget_realize( GTK_WIDGET(m_list) );
+  
   Show( TRUE );
   
   return TRUE;
@@ -112,22 +122,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 )
 {
-  wxFAIL_MSG("wxListBox::Append(clientdata) not implemented");
+  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 )
@@ -150,10 +182,10 @@ int wxListBox::FindString( const wxString &item ) const
   return -1;
 };
 
-char *wxListBox::GetClientData( int WXUNUSED(n) ) const
+char *wxListBox::GetClientData( int n ) const
 {
-  wxFAIL_MSG("wxListBox::GetClientData not implemented");
-
+  wxNode *node = m_clientData.Nth( n );
+  if (node) return ((char*)node->Data());
   return NULL;
 };
 
@@ -250,8 +282,10 @@ void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
 {
 };
 
-void wxListBox::SetClientData( 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) )
@@ -295,4 +329,10 @@ int wxListBox::GetIndex( GtkWidget *item ) const
   return -1;
 };
 
+GtkWidget *wxListBox::GetDropTargetWidget(void)
+{
+  return GTK_WIDGET(m_list);
+};
+
+