X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd0eed647daeb257f28699de879d2f4f5aeb7fb6..57c208c5759da71a637f0f0f5b7d3dc3eda09c02:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 2896e62535..0fef727841 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -15,13 +15,96 @@ #include "wx/dynarray.h" #include "wx/listbox.h" #include "wx/utils.h" -#include +#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 +//------------------------------------------------------------------------- + +#if (GTK_MINOR_VERSION == 1) +#if (GTK_MICRO_VERSION >= 5) +#define NEW_GTK_SCROLL_CODE +#endif +#endif //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnScroll; + +//----------------------------------------------------------------------------- +// "button_press_event" +//----------------------------------------------------------------------------- + +static gint +gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) +{ + if (g_blockEventsOnDrag) return FALSE; + if (g_blockEventsOnScroll) return FALSE; + + if (!listbox->HasVMT()) 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 ); + event.SetInt( sel ); + listbox->GetEventHandler()->ProcessEvent( event ); + } + + 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 ); + + 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 ); + + return FALSE; +} //----------------------------------------------------------------------------- // "select" and "deselect" @@ -64,6 +147,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) wxListBox::wxListBox() { m_list = (GtkList *) NULL; + m_hasCheckBoxes = FALSE; } bool wxListBox::Create( wxWindow *parent, wxWindowID id, @@ -72,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 ); @@ -80,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; @@ -91,7 +176,31 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); +#ifdef NEW_GTK_SCROLL_CODE + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), GTK_WIDGET(m_list) ); +#else 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; @@ -101,9 +210,26 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, for (int i = 0; i < n; i++) { + m_clientDataList.Append( (wxObject*) NULL ); + m_clientObjectList.Append( (wxObject*) NULL ); + GtkWidget *list_item; - list_item = gtk_list_item_new_with_label( choices[i] ); - + + if (m_hasCheckBoxes) + { + wxString str = "[-] "; + str += choices[i]; + list_item = gtk_list_item_new_with_label( str ); + } + else + { + 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", @@ -113,10 +239,21 @@ 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), + "key_press_event", + (GtkSignalFunc)gtk_listbox_key_press_callback, + (gpointer)this ); + } + ConnectWidget( list_item ); - m_clientDataList.Append( (wxObject*)NULL ); - gtk_widget_show( list_item ); } @@ -138,21 +275,25 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, wxListBox::~wxListBox() { - wxNode *node = m_clientDataList.First(); - while (node) - { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - node = node->Next(); - } - m_clientDataList.Clear(); + Clear(); } void wxListBox::AppendCommon( const wxString &item ) { wxCHECK_RET( m_list != NULL, "invalid listbox" ); - GtkWidget *list_item = gtk_list_item_new_with_label( item ); + GtkWidget *list_item; + + if (m_hasCheckBoxes) + { + wxString str = "[-] "; + str += item; + list_item = gtk_list_item_new_with_label( str ); + } + else + { + list_item = gtk_list_item_new_with_label( item ); + } gtk_signal_connect( GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); @@ -165,33 +306,50 @@ 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), + "key_press_event", + (GtkSignalFunc)gtk_listbox_key_press_callback, + (gpointer)this ); + } + gtk_widget_show( list_item ); ConnectWidget( list_item ); - ConnectDnDWidget( 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 ) { - m_clientDataList.Append( (wxObject*)NULL ); + m_clientDataList.Append( (wxObject*) NULL ); + m_clientObjectList.Append( (wxObject*) NULL ); AppendCommon( item ); } void wxListBox::Append( const wxString &item, void *clientData ) { - if (clientData) - m_clientDataList.Append( (wxObject*) new wxVoidClientData( clientData ) ); - else - m_clientDataList.Append( (wxObject*)NULL ); + m_clientDataList.Append( (wxObject*) clientData ); + m_clientObjectList.Append( (wxObject*) NULL ); AppendCommon( item ); } void wxListBox::Append( const wxString &item, wxClientData *clientData ) { - m_clientDataList.Append( (wxObject*) clientData ); + m_clientObjectList.Append( (wxObject*) clientData ); + m_clientDataList.Append( (wxObject*) NULL ); AppendCommon( item ); } @@ -203,13 +361,7 @@ void wxListBox::SetClientData( int n, void* clientData ) wxNode *node = m_clientDataList.Nth( n ); if (!node) return; - wxClientData *cd = (wxClientData*) node->Data(); - if (cd) delete cd; - - if (clientData) - node->SetData( (wxObject*) new wxVoidClientData(clientData) ); - else - node->SetData( (wxObject*) NULL ); + node->SetData( (wxObject*) clientData ); } void* wxListBox::GetClientData( int n ) @@ -219,18 +371,14 @@ void* wxListBox::GetClientData( int n ) wxNode *node = m_clientDataList.Nth( n ); if (!node) return NULL; - wxVoidClientData *cd = (wxVoidClientData*) node->Data(); - if (cd) - return cd->GetData(); - else - return (void*) NULL; + return node->Data(); } void wxListBox::SetClientObject( int n, wxClientData* clientData ) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - wxNode *node = m_clientDataList.Nth( n ); + wxNode *node = m_clientObjectList.Nth( n ); if (!node) return; wxClientData *cd = (wxClientData*) node->Data(); @@ -243,7 +391,7 @@ wxClientData* wxListBox::GetClientObject( int n ) { wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" ); - wxNode *node = m_clientDataList.Nth( n ); + wxNode *node = m_clientObjectList.Nth( n ); if (!node) return (wxClientData*) NULL; return (wxClientData*) node->Data(); @@ -255,13 +403,15 @@ void wxListBox::Clear() gtk_list_clear_items( m_list, 0, Number() ); - wxNode *node = m_clientDataList.First(); + wxNode *node = m_clientObjectList.First(); while (node) { wxClientData *cd = (wxClientData*)node->Data(); if (cd) delete cd; node = node->Next(); } + m_clientObjectList.Clear(); + m_clientDataList.Clear(); } @@ -271,25 +421,23 @@ void wxListBox::Delete( int n ) GList *child = g_list_nth( m_list->children, n ); - if (!child) - { - wxFAIL_MSG("wrong listbox index"); - return; - } + 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 ); - wxNode *node = m_clientDataList.Nth( n ); - if (!node) - { - wxFAIL_MSG( "wrong index" ); - } - else + wxNode *node = m_clientObjectList.Nth( n ); + if (node) { wxClientData *cd = (wxClientData*)node->Data(); if (cd) delete cd; + m_clientObjectList.DeleteNode( node ); + } + + node = m_clientDataList.Nth( n ); + if (node) + { m_clientDataList.DeleteNode( node ); } } @@ -311,7 +459,12 @@ int wxListBox::FindString( const wxString &item ) const { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - if (item == label->label) return count; + + wxString str = label->label; + if (m_hasCheckBoxes) str.Remove( 0, 4 ); + + if (str == item) return count; + count++; child = child->next; } @@ -375,7 +528,11 @@ wxString wxListBox::GetString( int n ) const { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - return label->label; + + wxString str = label->label; + if (m_hasCheckBoxes) str.Remove( 0, 4 ); + + return str; } wxFAIL_MSG("wrong listbox index"); return ""; @@ -389,9 +546,14 @@ wxString wxListBox::GetStringSelection() const if (selection) { GtkBin *bin = GTK_BIN( selection->data ); - wxString tmp = GTK_LABEL( bin->child )->label; - return tmp; + GtkLabel *label = GTK_LABEL( bin->child ); + + wxString str = label->label; + if (m_hasCheckBoxes) str.Remove( 0, 4 ); + + return str; } + wxFAIL_MSG("no listbox selection available"); return ""; } @@ -458,7 +620,12 @@ void wxListBox::SetString( int n, const wxString &string ) { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - gtk_label_set( label, string ); + + wxString str; + if (m_hasCheckBoxes) str += "[-] "; + str += string; + + gtk_label_set( label, str ); } else { @@ -489,26 +656,38 @@ 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" ); - GList *child = m_list->children; - while (child) +#ifndef NEW_GTK_DND_CODE + if (m_dropTarget) { - DisconnectDnDWidget( GTK_WIDGET( child->data ) ); - child = child->next; + GList *child = m_list->children; + while (child) + { + m_dropTarget->UnregisterWidget( GTK_WIDGET( child->data ) ); + child = child->next; + } } +#endif + + wxWindow::SetDropTarget( dropTarget ); - wxWindow::SetDropTarget( dropTarget ); - - child = m_list->children; - while (child) +#ifndef NEW_GTK_DND_CODE + if (m_dropTarget) { - ConnectDnDWidget( GTK_WIDGET( child->data ) ); - child = child->next; + GList *child = m_list->children; + while (child) + { + m_dropTarget->RegisterWidget( GTK_WIDGET( child->data ) ); + child = child->next; + } } +#endif } +#endif GtkWidget *wxListBox::GetConnectWidget() { @@ -534,16 +713,23 @@ void wxListBox::ApplyWidgetStyle() { SetWidgetStyle(); - GdkWindow *window = GTK_WIDGET(m_list)->window; - m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); - gdk_window_set_background( window, m_backgroundColour.GetColor() ); - gdk_window_clear( window ); + if (m_backgroundColour.Ok()) + { + GdkWindow *window = GTK_WIDGET(m_list)->window; + m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); + gdk_window_set_background( window, m_backgroundColour.GetColor() ); + gdk_window_clear( window ); + } GList *child = m_list->children; while (child) { - gtk_widget_set_style( GTK_BIN(child->data)->child, m_widgetStyle ); gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle ); + + GtkBin *bin = GTK_BIN( child->data ); + GtkWidget *label = GTK_WIDGET( bin->child ); + gtk_widget_set_style( label, m_widgetStyle ); + child = child->next; } }