More compilation fixes for Solaris. :-<

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 58c4bf34d62520f43f832f8f40de787d115ca92d..32cf66671e2e3169d8ecb0c60e2ce98a65446050 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -72,8 +72,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;
@@ -244,10 +261,13 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
                             (GtkSignalFunc)gtk_listbox_button_press_callback, 
                            (gpointer) this );
        
-        gtk_signal_connect( GTK_OBJECT(list_item), 
+       if (m_hasCheckBoxes)
+       {
+            gtk_signal_connect( GTK_OBJECT(list_item), 
                            "key_press_event",
                             (GtkSignalFunc)gtk_listbox_key_press_callback, 
                            (gpointer)this );
+       }
        
         ConnectWidget( list_item );    
        
@@ -308,10 +328,13 @@ void wxListBox::AppendCommon( const wxString &item )
                         (GtkSignalFunc)gtk_listbox_button_press_callback, 
                        (gpointer) this );
     
-    gtk_signal_connect( GTK_OBJECT(list_item), 
+    if (m_hasCheckBoxes)
+    {
+       gtk_signal_connect( GTK_OBJECT(list_item), 
                        "key_press_event",
                         (GtkSignalFunc)gtk_listbox_key_press_callback, 
-                       (gpointer)this );    
+                       (gpointer)this );
+    }
        
     gtk_widget_show( list_item );