New DnD and Clipboard code

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index a9ef5ae2875dc9fa1e87737fa91efe32393ed9d4..0fef7278411a13debb9512e02f3192a4ae376ee6 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -18,6 +18,13 @@
 #include "wx/intl.h"
 #include "wx/checklst.h"
 
 #include "wx/intl.h"
 #include "wx/checklst.h"
 

+#if wxUSE_DRAG_AND_DROP
+#include "wx/dnd.h"
+#endif
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+

 //-------------------------------------------------------------------------
 // conditional compilation
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // conditional compilation
 //-------------------------------------------------------------------------


@@ -47,14 +54,28 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
 
     if (!listbox->HasVMT()) return FALSE;
 
 
     if (!listbox->HasVMT()) return FALSE;
 

-    if (gdk_event->x > 15) return FALSE;
-    

     int sel = listbox->GetIndex( widget );
     
     int sel = listbox->GetIndex( widget );
     

-    wxCheckListBox *clb = (wxCheckListBox *)listbox;
+    if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS))
+    {
+        wxCheckListBox *clb = (wxCheckListBox *)listbox;

     
     

-    clb->Check( sel, !clb->IsChecked(sel) );
+        clb->Check( sel, !clb->IsChecked(sel) );
+    
+        wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
+        event.SetEventObject( listbox );
+        event.SetInt( sel );
+        listbox->GetEventHandler()->ProcessEvent( event );
+    }

     
     

+    if (gdk_event->type == GDK_2BUTTON_PRESS)
+    {
+        wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
+        event.SetEventObject( listbox );
+        event.SetInt( sel );
+        listbox->GetEventHandler()->ProcessEvent( event );
+    }
+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -77,6 +98,11 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
     
     clb->Check( sel, !clb->IsChecked(sel) );
     
     
     clb->Check( sel, !clb->IsChecked(sel) );
     

+    wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
+    event.SetEventObject( listbox );
+    event.SetInt( sel );
+    listbox->GetEventHandler()->ProcessEvent( event );
+       

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -213,17 +239,17 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
             gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
               GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
             gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
               GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 

+        gtk_signal_connect( GTK_OBJECT(list_item), 
+                           "button_press_event",
+                            (GtkSignalFunc)gtk_listbox_button_press_callback, 
+                           (gpointer) this );
+       

        if (m_hasCheckBoxes)
        {
             gtk_signal_connect( GTK_OBJECT(list_item), 
        if (m_hasCheckBoxes)
        {
             gtk_signal_connect( GTK_OBJECT(list_item), 

-                               "button_press_event",
-                                (GtkSignalFunc)gtk_listbox_button_press_callback, 
-                               (gpointer) this );
-                               
-            gtk_signal_connect( GTK_OBJECT(list_item), 
-                               "key_press_event",
-                                (GtkSignalFunc)gtk_listbox_key_press_callback, 
-                               (gpointer)this );
+                           "key_press_event",
+                            (GtkSignalFunc)gtk_listbox_key_press_callback, 
+                           (gpointer)this );

        }
        
         ConnectWidget( list_item );    
        }
        
         ConnectWidget( list_item );    


@@ -280,26 +306,28 @@ void wxListBox::AppendCommon( const wxString &item )
 
     if (m_widgetStyle) ApplyWidgetStyle();
   
 
     if (m_widgetStyle) ApplyWidgetStyle();
   

+    gtk_signal_connect( GTK_OBJECT(list_item), 
+                       "button_press_event",
+                        (GtkSignalFunc)gtk_listbox_button_press_callback, 
+                       (gpointer) this );
+    

     if (m_hasCheckBoxes)
     {
     if (m_hasCheckBoxes)
     {

-            gtk_signal_connect( GTK_OBJECT(list_item), 
-                               "button_press_event",
-                                (GtkSignalFunc)gtk_listbox_button_press_callback, 
-                               (gpointer) this );
-                               
-            gtk_signal_connect( GTK_OBJECT(list_item), 
-                               "key_press_event",
-                                (GtkSignalFunc)gtk_listbox_key_press_callback, 
-                               (gpointer)this );    
+       gtk_signal_connect( GTK_OBJECT(list_item), 
+                       "key_press_event",
+                        (GtkSignalFunc)gtk_listbox_key_press_callback, 
+                       (gpointer)this );

     }
        
     gtk_widget_show( list_item );
 
     ConnectWidget( list_item );
 
     }
        
     gtk_widget_show( list_item );
 
     ConnectWidget( list_item );
 

+#if wxUSE_DRAG_AND_DROP

 #ifndef NEW_GTK_DND_CODE
     if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
 #endif
 #ifndef NEW_GTK_DND_CODE
     if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
 #endif

+#endif

 }
 
 void wxListBox::Append( const wxString &item )
 }
 
 void wxListBox::Append( const wxString &item )


@@ -395,7 +423,7 @@ void wxListBox::Delete( int n )
 
     wxCHECK_RET( child, "wrong listbox index" );
 
 
     wxCHECK_RET( child, "wrong listbox index" );
 

-    GList *list = g_list_append( NULL, child->data );
+    GList *list = g_list_append( (GList*) NULL, child->data );

     gtk_list_remove_items( m_list, list );
     g_list_free( list );
 
     gtk_list_remove_items( m_list, list );
     g_list_free( list );
 


@@ -628,6 +656,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const
     return -1;
 }
 
     return -1;
 }
 

+#if wxUSE_DRAG_AND_DROP

 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
     wxCHECK_RET( m_list != NULL, "invalid listbox" );
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
     wxCHECK_RET( m_list != NULL, "invalid listbox" );


@@ -658,6 +687,7 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
     }
 #endif
 }
     }
 #endif
 }

+#endif

 
 GtkWidget *wxListBox::GetConnectWidget()
 {
 
 GtkWidget *wxListBox::GetConnectWidget()
 {