X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd0eed647daeb257f28699de879d2f4f5aeb7fb6..103aec296a2c017f915b4b2b2584191fdb716a75:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 2896e62535..818775ee73 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -15,13 +15,126 @@ #include "wx/dynarray.h" #include "wx/listbox.h" #include "wx/utils.h" -#include +#include "wx/intl.h" +#include "wx/checklst.h" + +#if wxUSE_TOOLTIPS +#include "wx/tooltip.h" +#endif + +#if wxUSE_DRAG_AND_DROP +#include "wx/dnd.h" +#endif + +#include "gdk/gdk.h" +#include "gtk/gtk.h" + +//------------------------------------------------------------------------- +// conditional compilation +//------------------------------------------------------------------------- + +#if (GTK_MINOR_VERSION > 0) +#define NEW_GTK_SCROLL_CODE +#endif + +//----------------------------------------------------------------------------- +// private functions +//----------------------------------------------------------------------------- + +#define CHECKBOX_STRING "[-] " + +// checklistboxes have "[±] " prepended to their lables, this macro removes it +// (NB: 4 below is the length of CHECKBOX_STRING above) +// +// the argument to it is a "const char *" pointer +#define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label)) //----------------------------------------------------------------------------- // 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 ); + + 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.IsEmpty()) event.m_commandString = str; + } + else + { + event.m_commandInt = -1 ; + event.m_commandString.Empty(); + } + + 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" @@ -41,18 +154,17 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox 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); + if (!str.IsEmpty()) event.m_commandString = str; } else { event.m_commandInt = -1 ; - event.m_commandString = copystring("") ; + event.m_commandString.Empty(); } event.SetEventObject( listbox ); listbox->GetEventHandler()->ProcessEvent( event ); - if (event.m_commandString) delete[] event.m_commandString ; } //----------------------------------------------------------------------------- @@ -64,6 +176,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) wxListBox::wxListBox() { m_list = (GtkList *) NULL; + m_hasCheckBoxes = FALSE; } bool wxListBox::Create( wxWindow *parent, wxWindowID id, @@ -72,6 +185,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 ); @@ -91,7 +205,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( GTK_BIN(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,8 +239,22 @@ 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] ); + + wxString str(choices[i]); + if (m_hasCheckBoxes) + { + str.Prepend(CHECKBOX_STRING); + } + + list_item = gtk_list_item_new_with_label( str ); + +#ifdef __WXDEBUG__ + debug_focus_in( list_item, "wxListBox::list_item", name ); +#endif gtk_container_add( GTK_CONTAINER(m_list), list_item ); @@ -113,9 +265,20 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_signal_connect( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - ConnectWidget( list_item ); - - m_clientDataList.Append( (wxObject*)NULL ); + 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 ); gtk_widget_show( list_item ); } @@ -123,13 +286,14 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, m_parent->AddChild( this ); (m_parent->m_insertCallback)( m_parent, this ); - + PostCreation(); gtk_widget_realize( GTK_WIDGET(m_list) ); SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); + SetFont( parent->GetFont() ); Show( TRUE ); @@ -138,21 +302,122 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, wxListBox::~wxListBox() { - wxNode *node = m_clientDataList.First(); - while (node) + Clear(); +} + +void wxListBox::InsertItems(int nItems, const wxString items[], int pos) +{ + wxCHECK_RET( m_list != NULL, "invalid listbox" ); + + GList *children = m_list->children; + int length = g_list_length(children); + wxCHECK_RET( pos <= length, "invalid index in wxListBox::InsertItems" ); + + // VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item + // into a listbox at the given position, this is why we first delete + // all items after this position, then append these items and then + // reappend back the old ones. + + // first detach the old items + int n; // loop var + + if ( pos == length ) { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - node = node->Next(); + // no need to do anything complicated + for ( n = 0; n < nItems; n++ ) + { + Append(items[n]); + } + + return; + } + + wxArrayString deletedLabels; + wxArrayPtrVoid deletedData; + wxArrayInt deletedChecks; // only for check list boxes + + GList *child = g_list_nth( children, pos ); + for ( n = 0; child != NULL; n++, child = child->next ) + { + // save label + GtkBin *bin = GTK_BIN( child->data ); + GtkLabel *label = GTK_LABEL( bin->child ); + + wxString str(GET_REAL_LABEL(label->label)); + deletedLabels.Add(str); + + // save data + void *clientData = NULL; + wxNode *node = NULL; + + if ( n < (int)m_clientObjectList.GetCount() ) + node = m_clientObjectList.Nth( n ); + + if ( node ) + { + clientData = node->GetData(); + m_clientObjectList.DeleteNode( node ); + } + + if ( !clientData ) + { + if ( n < (int)m_clientDataList.GetCount() ) + node = m_clientDataList.Nth( n ); + + if ( node ) + { + clientData = node->GetData(); + node = m_clientDataList.Nth( n ); + } + } + + deletedData.Add(clientData); + + // save check state + if ( m_hasCheckBoxes ) + { + deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n)); + } + } + + int nDeletedCount = n; + + gtk_list_clear_items( m_list, pos, length ); + + // now append the new items + for ( n = 0; n < nItems; n++ ) + { + Append(items[n]); + } + + // and append the old items too + pos += nItems; // now the indices are shifter + for ( n = 0; n < nDeletedCount; n++ ) + { + Append(deletedLabels[n], deletedData[n]); + + if ( m_hasCheckBoxes ) + { + ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]); + } } - m_clientDataList.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; + + wxString label(item); + if (m_hasCheckBoxes) + { + label.Prepend(CHECKBOX_STRING); + } + + list_item = gtk_list_item_new_with_label( label ); + + gtk_container_add( GTK_CONTAINER(m_list), list_item ); gtk_signal_connect( GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); @@ -161,91 +426,100 @@ void wxListBox::AppendCommon( const wxString &item ) gtk_signal_connect( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - gtk_container_add( GTK_CONTAINER(m_list), list_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 + +#if wxUSE_TOOLTIPS + if (m_toolTip) m_toolTip->Apply( this ); +#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 ); } void wxListBox::SetClientData( int n, void* clientData ) { wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + 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 ) { wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" ); - + 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(); if (cd) delete cd; - + node->SetData( (wxObject*) clientData ); } 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 +529,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 +547,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 ); } } @@ -304,14 +578,19 @@ void wxListBox::Deselect( int n ) int wxListBox::FindString( const wxString &item ) const { wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - + GList *child = m_list->children; int count = 0; while (child) { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - if (item == label->label) return count; + + wxString str = GET_REAL_LABEL(label->label); + + if (str == item) + return count; + count++; child = child->next; } @@ -324,7 +603,7 @@ int wxListBox::FindString( const wxString &item ) const int wxListBox::GetSelection() const { wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - + GList *child = m_list->children; int count = 0; while (child) @@ -339,7 +618,7 @@ int wxListBox::GetSelection() const int wxListBox::GetSelections( wxArrayInt& aSelections ) const { wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - + // get the number of selected items first GList *child = m_list->children; int count = 0; @@ -351,7 +630,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const aSelections.Empty(); - if (count > 0) + if (count > 0) { // now fill the list aSelections.Alloc(count); // optimization attempt @@ -369,29 +648,38 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const wxString wxListBox::GetString( int n ) const { wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); - + GList *child = g_list_nth( m_list->children, n ); if (child) { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - return label->label; + + wxString str = GET_REAL_LABEL(label->label); + + return str; } + wxFAIL_MSG("wrong listbox index"); + return ""; } wxString wxListBox::GetStringSelection() const { wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); - + GList *selection = m_list->selection; 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 = GET_REAL_LABEL(label->label); + + return str; } + wxFAIL_MSG("no listbox selection available"); return ""; } @@ -399,7 +687,7 @@ wxString wxListBox::GetStringSelection() const int wxListBox::Number() { wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - + GList *child = m_list->children; int count = 0; while (child) { count++; child = child->next; } @@ -409,7 +697,7 @@ int wxListBox::Number() bool wxListBox::Selected( int n ) { wxCHECK_MSG( m_list != NULL, FALSE, "invalid listbox" ); - + GList *target = g_list_nth( m_list->children, n ); if (target) { @@ -442,7 +730,7 @@ void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) ) void wxListBox::SetSelection( int n, bool select ) { wxCHECK_RET( m_list != NULL, "invalid listbox" ); - + if (select) gtk_list_select_item( m_list, n ); else @@ -452,24 +740,30 @@ void wxListBox::SetSelection( int n, bool select ) void wxListBox::SetString( int n, const wxString &string ) { wxCHECK_RET( m_list != NULL, "invalid listbox" ); - + GList *child = g_list_nth( m_list->children, n ); if (child) { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - gtk_label_set( label, string ); + + wxString str; + if (m_hasCheckBoxes) + str += CHECKBOX_STRING; + str += string; + + gtk_label_set( label, str ); } else { wxFAIL_MSG("wrong listbox index"); - } + } } void wxListBox::SetStringSelection( const wxString &string, bool select ) { wxCHECK_RET( m_list != NULL, "invalid listbox" ); - + SetSelection( FindString(string), select ); } @@ -489,26 +783,50 @@ int wxListBox::GetIndex( GtkWidget *item ) const return -1; } -void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) +#if wxUSE_TOOLTIPS +void wxListBox::ApplyToolTip( GtkTooltips *tips, const char *tip ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); - GList *child = m_list->children; while (child) { - DisconnectDnDWidget( GTK_WIDGET( child->data ) ); + gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), tip, (gchar*) NULL ); child = child->next; } +} +#endif // wxUSE_TOOLTIPS - wxWindow::SetDropTarget( dropTarget ); +#if wxUSE_DRAG_AND_DROP +void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) +{ + wxCHECK_RET( m_list != NULL, "invalid listbox" ); - 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->UnregisterWidget( GTK_WIDGET( child->data ) ); + child = child->next; + } + } +#endif + + wxWindow::SetDropTarget( dropTarget ); + +#ifndef NEW_GTK_DND_CODE + if (m_dropTarget) + { + GList *child = m_list->children; + while (child) + { + m_dropTarget->RegisterWidget( GTK_WIDGET( child->data ) ); + child = child->next; + } } +#endif } +#endif GtkWidget *wxListBox::GetConnectWidget() { @@ -533,17 +851,25 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) 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; } } +