Small modifications

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 8c927d8210c3809b8b34959fcd22771bc7534d17..c8a8bea0d769cd17a23d7b5940b1edcddb0c9e46 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -15,27 +15,46 @@
 
 #include "wx/dynarray.h"
 #include "wx/listbox.h"
+#include "wx/utils.h"
+#include <wx/intl.h>
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------
 
-void gtk_listitem_select_callback( GtkWidget *widget, gpointer data )
+static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )
 {
-  wxListBox *listbox = (wxListBox*)data;
-
-  wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+  if (!listbox->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
   
-  event.SetInt( listbox->GetIndex( widget ) );
-  
-  GtkBin *bin = GTK_BIN( widget );
-  GtkLabel *label = GTK_LABEL( bin->child );
-  wxString tmp( label->label );
-  event.SetString( WXSTRINGCAST(tmp) );
+  wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
   
+    wxArrayInt aSelections;
+    int count = listbox->GetSelections(aSelections);
+    if ( count > 0 )
+    {
+      event.m_commandInt = aSelections[0] ;
+      event.m_clientData = listbox->GetClientData(event.m_commandInt);
+      wxString str(listbox->GetString(event.m_commandInt));
+      if (str != "")
+        event.m_commandString = copystring((char *)(const char *)str);
+    }
+    else
+    {
+      event.m_commandInt = -1 ;
+      event.m_commandString = copystring("") ;
+    }
+
   event.SetEventObject( listbox );
-  
-  listbox->ProcessEvent( event );
+
+  listbox->GetEventHandler()->ProcessEvent( event );
+  if (event.m_commandString) delete[] event.m_commandString ;
 };
 
 //-----------------------------------------------------------------------------
@@ -49,16 +68,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;
   
@@ -87,47 +106,71 @@ 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 );
+    if ( style & wxLB_MULTIPLE )
+      gtk_signal_connect( GTK_OBJECT(list_item), "deselect", 
+        GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+  
+    m_clientData.Append( (wxObject*)NULL );
     
     gtk_widget_show( list_item );
   };
  
   PostCreation();
   
+  gtk_widget_realize( GTK_WIDGET(m_list) );
+  
   Show( TRUE );
   
   return TRUE;
 };
 
 void wxListBox::Append( const wxString &item )
+{
+  Append( item, (char*)NULL );
+};
+
+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_connect( GTK_OBJECT(list_item), "select", 
     GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
   
+  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_widget_show( list_item );
 };
 
-void wxListBox::Append( const wxString &WXUNUSED(item), char *WXUNUSED(clientData) )
-{
-  wxFAIL_MSG("wxListBox::Append(clientdata) not implemented");
-};
-
 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 +193,10 @@ int wxListBox::FindString( const wxString &item ) const
   return -1;
 };
 
-char *wxListBox::GetClientData( const 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;
 };
 
@@ -231,7 +274,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)
@@ -246,12 +289,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) )
@@ -262,7 +307,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 );
@@ -270,11 +315,18 @@ 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 n, const wxString &string )
 {
+  GList *child = g_list_nth( m_list->children, n );
+  if (child)
+  {
+    GtkBin *bin = GTK_BIN( child->data );
+    GtkLabel *label = GTK_LABEL( bin->child );
+    gtk_label_set( label, string );
+  };
 };
 
-void wxListBox::SetStringSelection( const wxString &string, const bool select )
+void wxListBox::SetStringSelection( const wxString &string, bool select )
 {
   SetSelection( FindString(string), select );
 };
@@ -295,4 +347,10 @@ int wxListBox::GetIndex( GtkWidget *item ) const
   return -1;
 };
 
+GtkWidget *wxListBox::GetConnectWidget(void)
+{
+  return GTK_WIDGET(m_list);
+};
+
+