more wxToolTip changes

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 0fef7278411a13debb9512e02f3192a4ae376ee6..6d6208d779a3fc4cacde8c2e2f39306e33498e0c 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -17,6 +17,7 @@
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"
+#include "wx/tooltip.h"
 
 #if wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"
@@ -72,8 +73,25 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
     {
         wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
         event.SetEventObject( listbox );
-        event.SetInt( sel );
+       
+        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("") ;
+        }
+
         listbox->GetEventHandler()->ProcessEvent( event );
+       
+        if (event.m_commandString) delete[] event.m_commandString ;
     }
 
     return FALSE;
@@ -328,6 +346,8 @@ void wxListBox::AppendCommon( const wxString &item )
     if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
 #endif
 #endif
+
+    if (m_toolTip) m_toolTip->Create( list_item );
 }
 
 void wxListBox::Append( const wxString &item )
@@ -656,6 +676,29 @@ int wxListBox::GetIndex( GtkWidget *item ) const
     return -1;
 }
 
+void wxListBox::SetToolTip( const wxString &tip )
+{
+    SetToolTip( new wxToolTip( tip ) );
+}
+
+void wxListBox::SetToolTip( wxToolTip *tip )
+{
+    if (m_toolTip) delete m_toolTip;
+    
+    m_toolTip = tip;
+    
+    if (!tip) return;
+    
+    m_toolTip->Create( GTK_WIDGET(m_list) );  /* this has no effect */
+    
+    GList *child = m_list->children;
+    while (child)
+    {
+       m_toolTip->Create( GTK_WIDGET( child->data ) );
+        child = child->next;
+    }
+}
+
 #if wxUSE_DRAG_AND_DROP
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
@@ -733,3 +776,4 @@ void wxListBox::ApplyWidgetStyle()
         child = child->next;
     }
 }
+