X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/caaa4cfd6779b689d6723e06df23cc23d1799fd3..da07e0335e1a75d785a1b0f61b26aab7e48aa51e:/src/gtk1/listbox.cpp diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 6570cb1c40..32cf66671e 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/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,7 +54,60 @@ 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 ); + + if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS)) + { + wxCheckListBox *clb = (wxCheckListBox *)listbox; + + 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 ); + + 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; +} + +//----------------------------------------------------------------------------- +// "key_press_event" +//----------------------------------------------------------------------------- + +static gint +gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox ) +{ + if (g_blockEventsOnDrag) return FALSE; + + if (!listbox->HasVMT()) return FALSE; + + if (gdk_event->keyval != ' ') return FALSE; int sel = listbox->GetIndex( widget ); @@ -55,6 +115,11 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, 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; } @@ -108,6 +173,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 ); @@ -116,7 +182,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; @@ -133,6 +199,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; @@ -158,6 +243,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", @@ -167,12 +256,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 ); + "key_press_event", + (GtkSignalFunc)gtk_listbox_key_press_callback, + (gpointer)this ); } ConnectWidget( list_item ); @@ -229,21 +323,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_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 ) @@ -339,7 +440,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 ); @@ -572,6 +673,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" ); @@ -602,6 +704,7 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) } #endif } +#endif GtkWidget *wxListBox::GetConnectWidget() {