X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1144d24d25ebf729407db27594dd51778f77cec4..11a23db53128bf244a089123b7fd27deb577a889:/src/gtk/listbox.cpp?ds=inline diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 22d401bd8a..ef4042412b 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -1,681 +1,902 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: listbox.cpp +// Name: src/gtk/listbox.cpp // Purpose: // Author: Robert Roebling -// Id: $Id$ +// Modified By: Ryan Norton (GtkTreeView implementation) // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#ifdef __GNUG__ -#pragma implementation "listbox.h" -#endif +#if wxUSE_LISTBOX -#include "wx/dynarray.h" #include "wx/listbox.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/checklst.h" -//------------------------------------------------------------------------- -// conditional compilation -//------------------------------------------------------------------------- +#ifndef WX_PRECOMP + #include "wx/dynarray.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/settings.h" + #include "wx/checklst.h" + #include "wx/arrstr.h" +#endif -#if (GTK_MINOR_VERSION == 1) -#if (GTK_MICRO_VERSION >= 5) -#define NEW_GTK_SCROLL_CODE +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" #endif + +#include +#include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" +#include "wx/gtk/private/object.h" +#include "wx/gtk/private/treeentry_gtk.h" + +#include +#ifdef __WXGTK3__ +#include #endif //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; -extern bool g_blockEventsOnScroll; +extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnScroll; + + //----------------------------------------------------------------------------- -// "button_press_event" +// Macro to tell which row the strings are in (1 if native checklist, 0 if not) //----------------------------------------------------------------------------- -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 wxUSE_CHECKLISTBOX +# define WXLISTBOX_DATACOLUMN_ARG(x) (x->m_hasCheckBoxes ? 1 : 0) +#else +# define WXLISTBOX_DATACOLUMN_ARG(x) (0) +#endif // wxUSE_CHECKLISTBOX - if (!listbox->HasVMT()) return FALSE; +#define WXLISTBOX_DATACOLUMN WXLISTBOX_DATACOLUMN_ARG(this) - if (gdk_event->x > 15) return FALSE; - - int sel = listbox->GetIndex( widget ); - - wxCheckListBox *clb = (wxCheckListBox *)listbox; - - clb->Check( sel, !clb->IsChecked(sel) ); - - return FALSE; +// ---------------------------------------------------------------------------- +// helper functions +// ---------------------------------------------------------------------------- + +namespace +{ + +// Return the entry for the given listbox item. +wxTreeEntry * +GetEntry(GtkListStore *store, GtkTreeIter *iter, const wxListBox *listbox) +{ + wxTreeEntry* entry; + gtk_tree_model_get(GTK_TREE_MODEL(store), + iter, + WXLISTBOX_DATACOLUMN_ARG(listbox), + &entry, + -1); + g_object_unref(entry); + return entry; } +} // anonymous namespace + //----------------------------------------------------------------------------- -// "key_press_event" +// "row-activated" //----------------------------------------------------------------------------- -static gint -gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox ) +extern "C" { +static void +gtk_listbox_row_activated_callback(GtkTreeView * WXUNUSED(treeview), + GtkTreePath *path, + GtkTreeViewColumn * WXUNUSED(col), + wxListBox *listbox) { - if (g_blockEventsOnDrag) return FALSE; + if (g_blockEventsOnDrag) return; + if (g_blockEventsOnScroll) return; - if (!listbox->HasVMT()) return FALSE; + // This is triggered by either a double-click or a space press - if (gdk_event->keyval != ' ') return FALSE; - - int sel = listbox->GetIndex( widget ); - - wxCheckListBox *clb = (wxCheckListBox *)listbox; - - clb->Check( sel, !clb->IsChecked(sel) ); - - return FALSE; + int sel = gtk_tree_path_get_indices(path)[0]; + + listbox->GTKOnActivated(sel); +} } //----------------------------------------------------------------------------- -// "select" and "deselect" +// "changed" //----------------------------------------------------------------------------- -static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox ) +extern "C" { +static void +gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection), + wxListBox *listbox ) { - if (!listbox->HasVMT()) return; if (g_blockEventsOnDrag) return; - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); + listbox->GTKOnSelectionChanged(); +} + +} - wxArrayInt aSelections; - int count = listbox->GetSelections(aSelections); - if ( count > 0 ) +//----------------------------------------------------------------------------- +// "key_press_event" +//----------------------------------------------------------------------------- + +extern "C" { +static gboolean +gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget), + GdkEventKey *gdk_event, + wxListBox *listbox ) +{ + if ((gdk_event->keyval == GDK_Return) || + (gdk_event->keyval == GDK_ISO_Enter) || + (gdk_event->keyval == GDK_KP_Enter)) { - 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); + int index = -1; + if (!listbox->HasMultipleSelection()) + index = listbox->GetSelection(); + else + { + wxArrayInt sels; + if (listbox->GetSelections( sels ) < 1) + return FALSE; + index = sels[0]; + } + + if (index != wxNOT_FOUND) + { + listbox->GTKOnActivated(index); + +// wxMac and wxMSW always invoke default action +// if (!ret) + { + // DClick not handled -> invoke default action + wxWindow *tlw = wxGetTopLevelParent( listbox ); + if (tlw) + { + GtkWindow *gtk_window = GTK_WINDOW( tlw->GetHandle() ); + if (gtk_window) + gtk_window_activate_default( gtk_window ); + } + } + + // Always intercept, otherwise we'd get another dclick + // event from row_activated + return TRUE; + } } - else + + return FALSE; +} +} + +//----------------------------------------------------------------------------- +// GtkTreeEntry destruction (to destroy client data) +//----------------------------------------------------------------------------- + +extern "C" { +static void tree_entry_destroy_cb(wxTreeEntry* entry, + wxListBox* listbox) +{ + if (listbox->HasClientObjectData()) { - event.m_commandInt = -1 ; - event.m_commandString = copystring("") ; + void* userdata = wx_tree_entry_get_userdata(entry); + if (userdata) + delete (wxClientData *)userdata; } +} +} + +//----------------------------------------------------------------------------- +// Sorting callback (standard CmpNoCase return value) +//----------------------------------------------------------------------------- + +extern "C" { +static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(model), + GtkTreeIter *a, + GtkTreeIter *b, + wxListBox *listbox) +{ + wxTreeEntry* entry1 = GetEntry(listbox->m_liststore, a, listbox); + wxCHECK_MSG(entry1, 0, wxT("Could not get first entry")); - event.SetEventObject( listbox ); + wxTreeEntry* entry2 = GetEntry(listbox->m_liststore, b, listbox); + wxCHECK_MSG(entry2, 0, wxT("Could not get second entry")); - listbox->GetEventHandler()->ProcessEvent( event ); - if (event.m_commandString) delete[] event.m_commandString ; + //We compare collate keys here instead of calling g_utf8_collate + //as it is rather slow (and even the docs recommend this) + return strcmp(wx_tree_entry_get_collate_key(entry1), + wx_tree_entry_get_collate_key(entry2)) >= 0; +} +} + +//----------------------------------------------------------------------------- +// Searching callback (TRUE == not equal, FALSE == equal) +//----------------------------------------------------------------------------- + +extern "C" { +static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model), + gint WXUNUSED(column), + const gchar* key, + GtkTreeIter* iter, + wxListBox* listbox) +{ + wxTreeEntry* entry = GetEntry(listbox->m_liststore, iter, listbox); + wxCHECK_MSG(entry, 0, wxT("Could not get entry")); + + wxGtkString keycollatekey(g_utf8_collate_key(key, -1)); + + return strcmp(keycollatekey, wx_tree_entry_get_collate_key(entry)) != 0; +} } //----------------------------------------------------------------------------- // wxListBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) +// ---------------------------------------------------------------------------- +// construction +// ---------------------------------------------------------------------------- -wxListBox::wxListBox() +void wxListBox::Init() { - m_list = (GtkList *) NULL; - m_hasCheckBoxes = FALSE; + m_treeview = NULL; +#if wxUSE_CHECKLISTBOX + m_hasCheckBoxes = false; +#endif // wxUSE_CHECKLISTBOX +} + +bool wxListBox::Create( wxWindow *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size, + const wxArrayString& choices, + long style, const wxValidator& validator, + const wxString &name ) +{ + wxCArrayString chs(choices); + + return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name ); } bool wxListBox::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int n, const wxString choices[], - long style, const wxValidator& validator, const wxString &name ) + long style, const wxValidator& validator, + const wxString &name ) { - m_needParent = TRUE; + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxListBox creation failed") ); + return false; + } - PreCreation( parent, id, pos, size, style, name ); + m_widget = gtk_scrolled_window_new( NULL, NULL ); + g_object_ref(m_widget); + if (style & wxLB_ALWAYS_SB) + { + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), + GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS ); + } + else + { + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); + } - SetValidator( validator ); - 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 ); + GTKScrolledWindowSetBorder(m_widget, style); - m_list = GTK_LIST( gtk_list_new() ); + m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) ); - GtkSelectionMode mode = GTK_SELECTION_BROWSE; - if (style & wxLB_MULTIPLE) - mode = GTK_SELECTION_MULTIPLE; - else if (style & wxLB_EXTENDED) - mode = GTK_SELECTION_EXTENDED; + //wxListBox doesn't have a header :) + //NB: If enabled SetFirstItem doesn't work correctly + gtk_tree_view_set_headers_visible(m_treeview, FALSE); - gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); +#if wxUSE_CHECKLISTBOX + if(m_hasCheckBoxes) + ((wxCheckListBox*)this)->DoCreateCheckList(); +#endif // wxUSE_CHECKLISTBOX -#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) ); + // Create the data column + gtk_tree_view_insert_column_with_attributes(m_treeview, -1, "", + gtk_cell_renderer_text_new(), + "text", + WXLISTBOX_DATACOLUMN, NULL); + + // Now create+set the model (GtkListStore) - first argument # of columns +#if wxUSE_CHECKLISTBOX + if(m_hasCheckBoxes) + m_liststore = gtk_list_store_new(2, G_TYPE_BOOLEAN, + WX_TYPE_TREE_ENTRY); + else #endif + m_liststore = gtk_list_store_new(1, WX_TYPE_TREE_ENTRY); + + gtk_tree_view_set_model(m_treeview, GTK_TREE_MODEL(m_liststore)); - gtk_widget_show( GTK_WIDGET(m_list) ); + g_object_unref (m_liststore); //free on treeview destruction - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 100; - if (newSize.y == -1) newSize.y = 110; - SetSize( newSize.x, newSize.y ); + // Disable the pop-up textctrl that enables searching - note that + // the docs specify that even if this disabled (which we are doing) + // the user can still have it through the start-interactive-search + // key binding...either way we want to provide a searchequal callback + // NB: If this is enabled a doubleclick event (activate) gets sent + // on a successful search + gtk_tree_view_set_search_column(m_treeview, WXLISTBOX_DATACOLUMN); + gtk_tree_view_set_search_equal_func(m_treeview, + (GtkTreeViewSearchEqualFunc) gtk_listbox_searchequal_callback, + this, + NULL); - for (int i = 0; i < n; i++) + gtk_tree_view_set_enable_search(m_treeview, FALSE); + + GtkSelectionMode mode; + // GTK_SELECTION_EXTENDED is a deprecated synonym for GTK_SELECTION_MULTIPLE + if ( style & (wxLB_MULTIPLE | wxLB_EXTENDED) ) { - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) NULL ); - - GtkWidget *list_item; - - 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] ); - } - - 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 ); - - if (style & wxLB_MULTIPLE) - gtk_signal_connect( GTK_OBJECT(list_item), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_select_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 ); - } - - ConnectWidget( list_item ); - - gtk_widget_show( list_item ); + mode = GTK_SELECTION_MULTIPLE; } + else // no multi-selection flags specified + { + m_windowStyle |= wxLB_SINGLE; - m_parent->AddChild( this ); + // Notice that we must use BROWSE and not GTK_SELECTION_SINGLE because + // the latter allows to not select any items at all while a single + // selection listbox is supposed to always have a selection (at least + // once the user selected something, it might not have any initially). + mode = GTK_SELECTION_BROWSE; + } - (m_parent->m_insertCallback)( m_parent, this ); - - PostCreation(); + GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview ); + gtk_tree_selection_set_mode( selection, mode ); - gtk_widget_realize( GTK_WIDGET(m_list) ); + // Handle sortable stuff + if(HasFlag(wxLB_SORT)) + { + // Setup sorting in ascending (wx) order + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(m_liststore), + WXLISTBOX_DATACOLUMN, + GTK_SORT_ASCENDING); + + // Set the sort callback + gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(m_liststore), + WXLISTBOX_DATACOLUMN, + (GtkTreeIterCompareFunc) gtk_listbox_sort_callback, + this, //userdata + NULL //"destroy notifier" + ); + } - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); - Show( TRUE ); + gtk_container_add (GTK_CONTAINER (m_widget), GTK_WIDGET(m_treeview) ); - return TRUE; + gtk_widget_show( GTK_WIDGET(m_treeview) ); + m_focusWidget = GTK_WIDGET(m_treeview); + + Append(n, choices); // insert initial items + + // generate dclick events + g_signal_connect_after(m_treeview, "row-activated", + G_CALLBACK(gtk_listbox_row_activated_callback), this); + + // for intercepting dclick generation by + g_signal_connect (m_treeview, "key_press_event", + G_CALLBACK (gtk_listbox_key_press_callback), + this); + m_parent->DoAddChild( this ); + + PostCreation(size); + SetInitialSize(size); // need this too because this is a wxControlWithItems + + g_signal_connect_after (selection, "changed", + G_CALLBACK (gtk_listitem_changed_callback), this); + + return true; } wxListBox::~wxListBox() { + if (m_treeview) + { + GTKDisconnect(m_treeview); + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); + if (selection) + GTKDisconnect(selection); + } + Clear(); } -void wxListBox::AppendCommon( const wxString &item ) +void wxListBox::GTKDisableEvents() { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); - - 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 ); - } + GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview ); - gtk_signal_connect( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); + g_signal_handlers_block_by_func(selection, + (gpointer) gtk_listitem_changed_callback, this); +} - if (GetWindowStyleFlag() & wxLB_MULTIPLE) - gtk_signal_connect( GTK_OBJECT(list_item), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); +void wxListBox::GTKEnableEvents() +{ + GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview ); - gtk_container_add( GTK_CONTAINER(m_list), list_item ); + g_signal_handlers_unblock_by_func(selection, + (gpointer) gtk_listitem_changed_callback, this); - if (m_widgetStyle) ApplyWidgetStyle(); - - 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 ); + UpdateOldSelections(); +} - ConnectWidget( list_item ); -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) m_dropTarget->RegisterWidget( list_item ); -#endif +void wxListBox::Update() +{ + wxWindow::Update(); + + if (m_treeview) + gdk_window_process_updates(gtk_widget_get_window(GTK_WIDGET(m_treeview)), true); } -void wxListBox::Append( const wxString &item ) +// ---------------------------------------------------------------------------- +// adding items +// ---------------------------------------------------------------------------- + +int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, + wxClientDataType type) { - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) NULL ); - - AppendCommon( item ); + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); + + InvalidateBestSize(); + int n = DoInsertItemsInLoop(items, pos, clientData, type); + UpdateOldSelections(); + return n; } -void wxListBox::Append( const wxString &item, void *clientData ) +int wxListBox::DoInsertOneItem(const wxString& item, unsigned int pos) { - m_clientDataList.Append( (wxObject*) clientData ); - m_clientObjectList.Append( (wxObject*) NULL ); - - AppendCommon( item ); + wxTreeEntry* entry = wx_tree_entry_new(); + wx_tree_entry_set_label(entry, wxGTK_CONV(item)); + wx_tree_entry_set_destroy_func(entry, (wxTreeEntryDestroy)tree_entry_destroy_cb, this); + +#if wxUSE_CHECKLISTBOX + int entryCol = int(m_hasCheckBoxes); +#else + int entryCol = 0; +#endif + gtk_list_store_insert_with_values(m_liststore, NULL, pos, entryCol, entry, -1); + g_object_unref(entry); + + return pos; } -void wxListBox::Append( const wxString &item, wxClientData *clientData ) +// ---------------------------------------------------------------------------- +// deleting items +// ---------------------------------------------------------------------------- + +void wxListBox::DoClear() { - m_clientObjectList.Append( (wxObject*) clientData ); - m_clientDataList.Append( (wxObject*) NULL ); - - AppendCommon( item ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); + + GTKDisableEvents(); // just in case + + InvalidateBestSize(); + + gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */ + + GTKEnableEvents(); + + UpdateOldSelections(); } -void wxListBox::SetClientData( int n, void* clientData ) +void wxListBox::DoDeleteOneItem(unsigned int n) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return; - - node->SetData( (wxObject*) clientData ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); + + InvalidateBestSize(); + + GTKDisableEvents(); // just in case + + GtkTreeIter iter; + wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("wrong listbox index") ); + + // this returns false if iter is invalid (e.g. deleting item at end) but + // since we don't use iter, we ignore the return value + gtk_list_store_remove(m_liststore, &iter); + + GTKEnableEvents(); } -void* wxListBox::GetClientData( int n ) +// ---------------------------------------------------------------------------- +// helper functions for working with iterators +// ---------------------------------------------------------------------------- + +bool wxListBox::GTKGetIteratorFor(unsigned pos, GtkTreeIter *iter) const { - wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" ); - - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return NULL; - - return node->Data(); + if ( !gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_liststore), + iter, NULL, pos) ) + { + wxLogDebug(wxT("gtk_tree_model_iter_nth_child(%u) failed"), pos); + return false; + } + + return true; } -void wxListBox::SetClientObject( int n, wxClientData* clientData ) +int wxListBox::GTKGetIndexFor(GtkTreeIter& iter) const { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - - wxNode *node = m_clientObjectList.Nth( n ); - if (!node) return; - - wxClientData *cd = (wxClientData*) node->Data(); - if (cd) delete cd; - - node->SetData( (wxObject*) clientData ); + GtkTreePath *path = + gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter); + + gint* pIntPath = gtk_tree_path_get_indices(path); + + wxCHECK_MSG( pIntPath, wxNOT_FOUND, wxT("failed to get iterator path") ); + + int idx = pIntPath[0]; + + gtk_tree_path_free( path ); + + return idx; } -wxClientData* wxListBox::GetClientObject( int n ) +// get GtkTreeEntry from position (note: you need to g_unref it if valid) +wxTreeEntry* wxListBox::GTKGetEntry(unsigned n) const { - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" ); - - wxNode *node = m_clientObjectList.Nth( n ); - if (!node) return (wxClientData*) NULL; - - return (wxClientData*) node->Data(); + GtkTreeIter iter; + if ( !GTKGetIteratorFor(n, &iter) ) + return NULL; + + return GetEntry(m_liststore, &iter, this); } -void wxListBox::Clear() +// ---------------------------------------------------------------------------- +// client data +// ---------------------------------------------------------------------------- + +void* wxListBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxTreeEntry* entry = GTKGetEntry(n); + wxCHECK_MSG(entry, NULL, wxT("could not get entry")); + + return wx_tree_entry_get_userdata(entry); +} - gtk_list_clear_items( m_list, 0, Number() ); +void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) +{ + wxTreeEntry* entry = GTKGetEntry(n); + wxCHECK_RET(entry, wxT("could not get entry")); - 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(); + wx_tree_entry_set_userdata(entry, clientData); } -void wxListBox::Delete( int n ) +// ---------------------------------------------------------------------------- +// string list access +// ---------------------------------------------------------------------------- + +void wxListBox::SetString(unsigned int n, const wxString& label) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - GList *child = g_list_nth( m_list->children, n ); + GtkTreeIter iter; + wxCHECK_RET(GTKGetIteratorFor(n, &iter), "invalid index"); + wxTreeEntry* entry = GetEntry(m_liststore, &iter, this); - wxCHECK_RET( child, "wrong listbox index" ); + // update the item itself + wx_tree_entry_set_label(entry, wxGTK_CONV(label)); - GList *list = g_list_append( NULL, child->data ); - gtk_list_remove_items( m_list, list ); - g_list_free( list ); + // signal row changed + GtkTreeModel* tree_model = GTK_TREE_MODEL(m_liststore); + GtkTreePath* path = gtk_tree_model_get_path(tree_model, &iter); + gtk_tree_model_row_changed(tree_model, path, &iter); + gtk_tree_path_free(path); +} - 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 ); - } +wxString wxListBox::GetString(unsigned int n) const +{ + wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") ); + + wxTreeEntry* entry = GTKGetEntry(n); + wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") ); + + return wxGTK_CONV_BACK(wx_tree_entry_get_label(entry)); } -void wxListBox::Deselect( int n ) +unsigned int wxListBox::GetCount() const { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox") ); - gtk_list_unselect_item( m_list, n ); + return (unsigned int)gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_liststore), NULL); } -int wxListBox::FindString( const wxString &item ) const +int wxListBox::FindString( const wxString &item, bool bCase ) const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - - GList *child = m_list->children; - int count = 0; - while (child) + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); + + //Sort of hackish - maybe there is a faster way + unsigned int nCount = wxListBox::GetCount(); + + for(unsigned int i = 0; i < nCount; ++i) { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str = label->label; - if (m_hasCheckBoxes) str.Remove( 0, 4 ); - - if (str == item) return count; - - count++; - child = child->next; + if( item.IsSameAs( wxListBox::GetString(i), bCase ) ) + return (int)i; } - // it's not an error if the string is not found -> no wxCHECK - return -1; + // it's not an error if the string is not found -> no wxCHECK + return wxNOT_FOUND; } -int wxListBox::GetSelection() const +// ---------------------------------------------------------------------------- +// selection +// ---------------------------------------------------------------------------- + +void wxListBox::GTKOnActivated(int item) { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - - GList *child = m_list->children; - int count = 0; - while (child) - { - if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) return count; - count++; - child = child->next; - } - return -1; + SendEvent(wxEVT_LISTBOX_DCLICK, item, IsSelected(item)); } -int wxListBox::GetSelections( wxArrayInt& aSelections ) const +void wxListBox::GTKOnSelectionChanged() { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - - // get the number of selected items first - GList *child = m_list->children; - int count = 0; - for (child = m_list->children; child != NULL; child = child->next) + if ( HasFlag(wxLB_MULTIPLE | wxLB_EXTENDED) ) { - if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) - count++; + CalcAndSendEvent(); } - - aSelections.Empty(); - - if (count > 0) + else // single selection { - // now fill the list - aSelections.Alloc(count); // optimization attempt - int i = 0; - for (child = m_list->children; child != NULL; child = child->next, i++) - { - if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) - aSelections.Add(i); - } + const int item = GetSelection(); + if ( DoChangeSingleSelection(item) ) + SendEvent(wxEVT_LISTBOX, item, true); } - - return count; } -wxString wxListBox::GetString( int n ) const +int wxListBox::GetSelection() 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 ); - - wxString str = label->label; - if (m_hasCheckBoxes) str.Remove( 0, 4 ); - - return str; - } - wxFAIL_MSG("wrong listbox index"); - return ""; + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox")); + wxCHECK_MSG( HasFlag(wxLB_SINGLE), wxNOT_FOUND, + wxT("must be single selection listbox")); + + GtkTreeIter iter; + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); + + // only works on single-sel + if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) + return wxNOT_FOUND; + + return GTKGetIndexFor(iter); } -wxString wxListBox::GetStringSelection() const +int wxListBox::GetSelections( wxArrayInt& aSelections ) const { - wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); - - GList *selection = m_list->selection; - if (selection) - { - GtkBin *bin = GTK_BIN( selection->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str = label->label; - if (m_hasCheckBoxes) str.Remove( 0, 4 ); - - return str; + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); + + aSelections.Empty(); + + int i = 0; + GtkTreeIter iter; + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); + + if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(m_liststore), &iter)) + { //gtk_tree_selection_get_selected_rows is GTK 2.2+ so iter instead + do + { + if (gtk_tree_selection_iter_is_selected(selection, &iter)) + aSelections.Add(i); + + i++; + } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(m_liststore), &iter)); } - - wxFAIL_MSG("no listbox selection available"); - return ""; + + return aSelections.GetCount(); } -int wxListBox::Number() +bool wxListBox::IsSelected( int n ) const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - - GList *child = m_list->children; - int count = 0; - while (child) { count++; child = child->next; } - return count; + wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid listbox") ); + + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); + + GtkTreeIter iter; + wxCHECK_MSG( GTKGetIteratorFor(n, &iter), false, wxT("Invalid index") ); + + return gtk_tree_selection_iter_is_selected(selection, &iter) != 0; } -bool wxListBox::Selected( int n ) +void wxListBox::DoSetSelection( int n, bool select ) { - wxCHECK_MSG( m_list != NULL, FALSE, "invalid listbox" ); - - GList *target = g_list_nth( m_list->children, n ); - if (target) + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); + + GTKDisableEvents(); + + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); + + // passing -1 to SetSelection() is documented to deselect all items + if ( n == wxNOT_FOUND ) { - GList *child = m_list->selection; - while (child) - { - if (child->data == target->data) return TRUE; - child = child->next; - } + gtk_tree_selection_unselect_all(selection); + GTKEnableEvents(); + return; } - wxFAIL_MSG("wrong listbox index"); - return FALSE; -} -void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) ) -{ - wxFAIL_MSG("wxListBox::Set not implemented"); + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") ); + + + GtkTreeIter iter; + wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("Invalid index") ); + + if (select) + gtk_tree_selection_select_iter(selection, &iter); + else + gtk_tree_selection_unselect_iter(selection, &iter); + + GtkTreePath* path = gtk_tree_model_get_path( + GTK_TREE_MODEL(m_liststore), &iter); + + gtk_tree_view_scroll_to_cell(m_treeview, path, NULL, FALSE, 0.0f, 0.0f); + + gtk_tree_path_free(path); + + GTKEnableEvents(); } -void wxListBox::SetFirstItem( int WXUNUSED(n) ) +void wxListBox::DoScrollToCell(int n, float alignY, float alignX) { - wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); + wxCHECK_RET( m_treeview, wxT("invalid listbox") ); + wxCHECK_RET( IsValid(n), wxT("invalid index")); + + //RN: I have no idea why this line is needed... + if (gtk_widget_has_grab(GTK_WIDGET(m_treeview))) + return; + + GtkTreeIter iter; + if ( !GTKGetIteratorFor(n, &iter) ) + return; + + GtkTreePath* path = gtk_tree_model_get_path( + GTK_TREE_MODEL(m_liststore), &iter); + + // Scroll to the desired cell (0.0 == topleft alignment) + gtk_tree_view_scroll_to_cell(m_treeview, path, NULL, + TRUE, alignY, alignX); + + gtk_tree_path_free(path); } -void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) ) +void wxListBox::DoSetFirstItem(int n) { - wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); + DoScrollToCell(n, 0, 0); } -void wxListBox::SetSelection( int n, bool select ) +void wxListBox::EnsureVisible(int n) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); - - if (select) - gtk_list_select_item( m_list, n ); - else - gtk_list_unselect_item( m_list, n ); + DoScrollToCell(n, 0.5, 0); } -void wxListBox::SetString( int n, const wxString &string ) +// ---------------------------------------------------------------------------- +// hittest +// ---------------------------------------------------------------------------- + +int wxListBox::DoListHitTest(const wxPoint& point) const { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); - - GList *child = g_list_nth( m_list->children, n ); - if (child) + // gtk_tree_view_get_path_at_pos() also gets items that are not visible and + // we only want visible items we need to check for it manually here + if ( !GetClientRect().Contains(point) ) + return wxNOT_FOUND; + + // need to translate from master window since it is in client coords + gint binx, biny; + gdk_window_get_geometry(gtk_tree_view_get_bin_window(m_treeview), + &binx, &biny, NULL, NULL); + + GtkTreePath* path; + if ( !gtk_tree_view_get_path_at_pos + ( + m_treeview, + point.x - binx, + point.y - biny, + &path, + NULL, // [out] column (always 0 here) + NULL, // [out] x-coord relative to the cell (not interested) + NULL // [out] y-coord relative to the cell + ) ) { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str; - if (m_hasCheckBoxes) str += "[-] "; - str += string; - - gtk_label_set( label, str ); + return wxNOT_FOUND; } - else - { - wxFAIL_MSG("wrong listbox index"); - } + + int index = gtk_tree_path_get_indices(path)[0]; + gtk_tree_path_free(path); + + return index; } -void wxListBox::SetStringSelection( const wxString &string, bool select ) +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- + +GtkWidget *wxListBox::GetConnectWidget() { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); - - SetSelection( FindString(string), select ); + // the correct widget for listbox events (such as mouse clicks for example) + // is m_treeview, not the parent scrolled window + return GTK_WIDGET(m_treeview); } -int wxListBox::GetIndex( GtkWidget *item ) const +GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - if (item) - { - GList *child = m_list->children; - int count = 0; - while (child) - { - if (GTK_WIDGET(child->data) == item) return count; - count++; - child = child->next; - } - } - return -1; + return gtk_tree_view_get_bin_window(m_treeview); } -void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) +void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); - -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) +#ifdef __WXGTK3__ + // don't know if this is even necessary, or how to do it +#else + if (m_hasBgCol && m_backgroundColour.IsOk()) { - GList *child = m_list->children; - while (child) + GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview); + if (window) { - m_dropTarget->UnregisterWidget( GTK_WIDGET( child->data ) ); - child = child->next; + m_backgroundColour.CalcPixel( gdk_drawable_get_colormap( window ) ); + gdk_window_set_background( window, m_backgroundColour.GetColor() ); + gdk_window_clear( window ); } } #endif - - wxWindow::SetDropTarget( dropTarget ); -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) + GTKApplyStyle(GTK_WIDGET(m_treeview), style); +} + +wxSize wxListBox::DoGetBestSize() const +{ + wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view")); + + // Start with a minimum size that's not too small + int cx, cy; + GetTextExtent( wxT("X"), &cx, &cy); + int lbWidth = 0; + int lbHeight = 10; + + // Find the widest string. + const unsigned int count = GetCount(); + if ( count ) { - GList *child = m_list->children; - while (child) + int wLine; + for ( unsigned int i = 0; i < count; i++ ) { - m_dropTarget->RegisterWidget( GTK_WIDGET( child->data ) ); - child = child->next; + GetTextExtent(GetString(i), &wLine, NULL); + if ( wLine > lbWidth ) + lbWidth = wLine; } } -#endif -} -GtkWidget *wxListBox::GetConnectWidget() -{ - return GTK_WIDGET(m_list); -} + lbWidth += 3 * cx; -bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) -{ - if (wxWindow::IsOwnGtkWindow( window )) return TRUE; - - GList *child = m_list->children; - while (child) + // And just a bit more for the checkbox if present and then some + // (these are rough guesses) +#if wxUSE_CHECKLISTBOX + if ( m_hasCheckBoxes ) { - GtkWidget *bin = GTK_WIDGET( child->data ); - if (bin->window == window) return TRUE; - child = child->next; + lbWidth += 35; + cy = cy > 25 ? cy : 25; // rough height of checkbox } +#endif - return FALSE; + // Add room for the scrollbar + lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + + // Don't make the listbox too tall but don't make it too small neither + lbHeight = (cy+4) * wxMin(wxMax(count, 3), 10); + + wxSize best(lbWidth, lbHeight); + CacheBestSize(best); + return best; } -void wxListBox::ApplyWidgetStyle() +// static +wxVisualAttributes +wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - SetWidgetStyle(); - - 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_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; - } + return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new(), true); } + +#endif // wxUSE_LISTBOX