X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1144d24d25ebf729407db27594dd51778f77cec4..0d2a2b601b1994333886dff8f53d82a714c4042f:/src/gtk/listbox.cpp

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 22d401bd8a..0fef727841 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -18,6 +18,13 @@
 #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
 //-------------------------------------------------------------------------
@@ -47,14 +54,28 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
 
     if (!listbox->HasVMT()) return FALSE;
 
-    if (gdk_event->x > 15) return FALSE;
-    
     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;
 }
 
@@ -77,6 +98,11 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
     
     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;
 }
 
@@ -130,6 +156,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator, const wxString &name )
 {
     m_needParent = TRUE;
+    m_acceptsFocus = TRUE;
 
     PreCreation( parent, id, pos, size, style, name );
 
@@ -138,7 +165,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
     gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
-
+      
     m_list = GTK_LIST( gtk_list_new() );
 
     GtkSelectionMode mode = GTK_SELECTION_BROWSE;
@@ -155,6 +182,25 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
 #endif
 
+#ifdef __WXDEBUG__
+    debug_focus_in( m_widget, "wxListBox::m_widget", name );
+    
+    debug_focus_in( GTK_WIDGET(m_list), "wxListBox::m_list", name );
+
+    GtkScrolledWindow *s_window = GTK_SCROLLED_WINDOW(m_widget);
+
+    debug_focus_in( s_window->hscrollbar, "wxWindow::hsrcollbar", name );
+    debug_focus_in( s_window->vscrollbar, "wxWindow::vsrcollbar", name );
+
+#ifdef NEW_GTK_SCROLL_CODE
+    GtkViewport *viewport = GTK_VIEWPORT(s_window->child);
+#else
+    GtkViewport *viewport = GTK_VIEWPORT(s_window->viewport);
+#endif
+
+    debug_focus_in( GTK_WIDGET(viewport), "wxWindow::viewport", name );
+#endif
+
     gtk_widget_show( GTK_WIDGET(m_list) );
 
     wxSize newSize = size;
@@ -180,6 +226,10 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
             list_item = gtk_list_item_new_with_label( choices[i] );
 	}
 
+#ifdef __WXDEBUG__
+        debug_focus_in( list_item, "wxListBox::list_item", name );
+#endif    
+    
         gtk_container_add( GTK_CONTAINER(m_list), list_item );
 
         gtk_signal_connect( GTK_OBJECT(list_item), "select",
@@ -189,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), 
+	                    "button_press_event",
+                            (GtkSignalFunc)gtk_listbox_button_press_callback, 
+			    (gpointer) this );
+	
 	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 );	
@@ -256,26 +306,28 @@ void wxListBox::AppendCommon( const wxString &item )
 
     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)
     {
-            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 );
 
+#if wxUSE_DRAG_AND_DROP
 #ifndef NEW_GTK_DND_CODE
     if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
 #endif
+#endif
 }
 
 void wxListBox::Append( const wxString &item )
@@ -371,7 +423,7 @@ void wxListBox::Delete( int n )
 
     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 );
 
@@ -604,6 +656,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const
     return -1;
 }
 
+#if wxUSE_DRAG_AND_DROP
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
     wxCHECK_RET( m_list != NULL, "invalid listbox" );
@@ -634,6 +687,7 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
     }
 #endif
 }
+#endif
 
 GtkWidget *wxListBox::GetConnectWidget()
 {