X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce4169a4d129fc6cd165b2e9ccc5cf5d48356020..8ca1a013e4e699724040ff1f514dab3b4a11d3c9:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 4c496c67a0..15c70a351d 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -1,254 +1,316 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: listbox.cpp +// Name: src/gtk/listbox.cpp // Purpose: // Author: Robert Roebling +// Modified By: Ryan Norton (GtkTreeView implementation) // Id: $Id$ // 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/listbox.h" -#if wxUSE_LISTBOX +#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 -#include "wx/dynarray.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/checklst.h" -#include "wx/settings.h" +#include "wx/gtk/private.h" +#include "wx/gtk/treeentry_gtk.h" #if wxUSE_TOOLTIPS -#include "wx/tooltip.h" -#endif - -#if wxUSE_DRAG_AND_DROP -#include "wx/dnd.h" + #include "wx/tooltip.h" #endif -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- -// idle system +// data //----------------------------------------------------------------------------- -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnScroll; -//------------------------------------------------------------------------- -// conditional compilation -//------------------------------------------------------------------------- -#if (GTK_MINOR_VERSION > 0) - #define NEW_GTK_SCROLL_CODE -#endif //----------------------------------------------------------------------------- -// private functions +// Macro to tell which row the strings are in (1 if native checklist, 0 if not) //----------------------------------------------------------------------------- #if wxUSE_CHECKLISTBOX - -#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)) - -#else // !wxUSE_CHECKLISTBOX - -#define GET_REAL_LABEL(label) (label) - +# define WXLISTBOX_DATACOLUMN_ARG(x) (x->m_hasCheckBoxes ? 1 : 0) +#else +# define WXLISTBOX_DATACOLUMN_ARG(x) (0) #endif // wxUSE_CHECKLISTBOX -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- - -extern bool g_blockEventsOnDrag; -extern bool g_blockEventsOnScroll; - -static bool g_hasDoubleClicked = FALSE; +#define WXLISTBOX_DATACOLUMN WXLISTBOX_DATACOLUMN_ARG(this) //----------------------------------------------------------------------------- -// "button_release_event" +// "row-activated" //----------------------------------------------------------------------------- -/* we would normally emit a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event once - a GDK_2BUTTON_PRESS occurs, but this has the particular problem of the - listbox keeping the focus until it receives a GDK_BUTTON_RELEASE event. - this can lead to race conditions so that we emit the dclick event - after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */ - -static gint -gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) +extern "C" { +static void +gtk_listbox_row_activated_callback(GtkTreeView *treeview, + GtkTreePath *path, + GtkTreeViewColumn *col, + wxListBox *listbox) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_blockEventsOnDrag) return; + if (g_blockEventsOnScroll) return; - if (g_blockEventsOnDrag) return FALSE; - if (g_blockEventsOnScroll) return FALSE; + // This is triggered by either a double-click or a space press - if (!listbox->m_hasVMT) return FALSE; + int sel = gtk_tree_path_get_indices(path)[0]; - if (!g_hasDoubleClicked) return FALSE; + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); + event.SetEventObject( listbox ); - wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); - event.SetEventObject( listbox ); + if (listbox->IsSelected(sel)) + { + GtkTreeEntry* entry = listbox->GtkGetEntry(sel); - wxArrayInt aSelections; - int count = listbox->GetSelections(aSelections); - if ( count > 0 ) + if (entry) { - 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; + event.SetInt(sel); + event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry))); + + if ( listbox->HasClientObjectData() ) + event.SetClientObject( (wxClientData*) gtk_tree_entry_get_userdata(entry) ); + else if ( listbox->HasClientUntypedData() ) + event.SetClientData( gtk_tree_entry_get_userdata(entry) ); + + g_object_unref (entry); } else { - event.m_commandInt = -1 ; - event.m_commandString.Empty(); + wxLogSysError(wxT("Internal error - could not get entry for double-click")); + event.SetInt(-1); } + } + else + { + event.SetInt(-1); + } - listbox->GetEventHandler()->ProcessEvent( event ); - - return FALSE; + listbox->GetEventHandler()->ProcessEvent( event ); +} } //----------------------------------------------------------------------------- -// "button_press_event" +// "changed" //----------------------------------------------------------------------------- -static gint -gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) +extern "C" { +static void +gtk_listitem_changed_callback( GtkTreeSelection* selection, wxListBox *listbox ) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (g_blockEventsOnDrag) return FALSE; - if (g_blockEventsOnScroll) return FALSE; + if (g_blockEventsOnDrag) return; - if (!listbox->m_hasVMT) return FALSE; + if (listbox->m_blockEvent) return; - int sel = listbox->GetIndex( widget ); + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); + event.SetEventObject( listbox ); -#if wxUSE_CHECKLISTBOX - if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS)) + if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED)) { - wxCheckListBox *clb = (wxCheckListBox *)listbox; + wxArrayInt selections; + listbox->GetSelections( selections ); + + if (selections.GetCount() == 0) + { + // indicate that this is a deselection + event.SetExtraLong( 0 ); + event.SetInt( -1 ); - clb->Check( sel, !clb->IsChecked(sel) ); + listbox->GetEventHandler()->ProcessEvent( event ); - wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); - event.SetEventObject( listbox ); - event.SetInt( sel ); - listbox->GetEventHandler()->ProcessEvent( event ); + return; + } + else + { + // indicate that this is a selection + event.SetExtraLong( 1 ); + event.SetInt( selections[0] ); + + listbox->GetEventHandler()->ProcessEvent( event ); + } } -#endif // wxUSE_CHECKLISTBOX - - /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */ - g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS); + else + { + int index = listbox->GetSelection(); + if (index == wxNOT_FOUND) + { + // indicate that this is a deselection + event.SetExtraLong( 0 ); + event.SetInt( -1 ); + + listbox->GetEventHandler()->ProcessEvent( event ); - return FALSE; + return; + } + else + { + GtkTreeEntry* entry = listbox->GtkGetEntry( index ); + + // indicate that this is a selection + event.SetExtraLong( 1 ); + + event.SetInt( index ); + event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry))); + + if ( listbox->HasClientObjectData() ) + event.SetClientObject( + (wxClientData*) gtk_tree_entry_get_userdata(entry) + ); + else if ( listbox->HasClientUntypedData() ) + event.SetClientData( gtk_tree_entry_get_userdata(entry) ); + + listbox->GetEventHandler()->ProcessEvent( event ); + + g_object_unref (entry); + } + } +} } //----------------------------------------------------------------------------- -// "key_press_event" +// GtkTreeEntry destruction (to destroy client data) //----------------------------------------------------------------------------- -#if wxUSE_CHECKLISTBOX -static gint -gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox ) +extern "C" { +static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry, + wxListBox* listbox) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (g_blockEventsOnDrag) return FALSE; - - if (!listbox->m_hasVMT) return FALSE; + if (listbox->HasClientObjectData()) + { + gpointer userdata = gtk_tree_entry_get_userdata(entry); + if (userdata) + delete (wxClientData *)userdata; + } +} +} - if (gdk_event->keyval != ' ') return FALSE; +//----------------------------------------------------------------------------- +// Sorting callback (standard CmpNoCase return value) +//----------------------------------------------------------------------------- - int sel = listbox->GetIndex( widget ); +extern "C" { +static gint gtk_listbox_sort_callback(GtkTreeModel *model, + GtkTreeIter *a, + GtkTreeIter *b, + wxListBox *listbox) +{ + GtkTreeEntry* entry; + GtkTreeEntry* entry2; - wxCheckListBox *clb = (wxCheckListBox *)listbox; + gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore), + a, + WXLISTBOX_DATACOLUMN_ARG(listbox), + &entry, -1); + gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore), + b, + WXLISTBOX_DATACOLUMN_ARG(listbox), + &entry2, -1); + wxCHECK_MSG(entry, 0, wxT("Could not get entry")); + wxCHECK_MSG(entry2, 0, wxT("Could not get entry2")); - clb->Check( sel, !clb->IsChecked(sel) ); + //We compare collate keys here instead of calling g_utf8_collate + //as it is rather slow (and even the docs reccommend this) + int ret = strcasecmp(gtk_tree_entry_get_collate_key(entry), + gtk_tree_entry_get_collate_key(entry2)); - wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); - event.SetEventObject( listbox ); - event.SetInt( sel ); - listbox->GetEventHandler()->ProcessEvent( event ); + g_object_unref (entry); + g_object_unref (entry2); - return FALSE; + return ret; +} } -#endif // wxUSE_CHECKLISTBOX //----------------------------------------------------------------------------- -// "select" and "deselect" +// Searching callback (TRUE == not equal, FALSE == equal) //----------------------------------------------------------------------------- -static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox ) +extern "C" { +static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model, + gint column, + const gchar* key, + GtkTreeIter* iter, + wxListBox* listbox) { - if (g_isIdle) wxapp_install_idle_handler(); + GtkTreeEntry* entry; - if (!listbox->m_hasVMT) return; - if (g_blockEventsOnDrag) return; + gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore), + iter, + WXLISTBOX_DATACOLUMN_ARG(listbox), + &entry, -1); + wxCHECK_MSG(entry, 0, wxT("Could not get entry")); + wxGtkString keycollatekey(g_utf8_collate_key(key, -1)); - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); + int ret = strcasecmp(keycollatekey, + gtk_tree_entry_get_collate_key(entry)); - 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(); - } - - event.SetEventObject( listbox ); + g_object_unref (entry); - listbox->GetEventHandler()->ProcessEvent( event ); + return ret != 0; +} } //----------------------------------------------------------------------------- // wxListBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) + +// ---------------------------------------------------------------------------- +// construction +// ---------------------------------------------------------------------------- -wxListBox::wxListBox() +void wxListBox::Init() { - m_list = (GtkList *) NULL; + m_treeview = (GtkTreeView*) NULL; #if wxUSE_CHECKLISTBOX - m_hasCheckBoxes = FALSE; + m_hasCheckBoxes = false; #endif // wxUSE_CHECKLISTBOX } 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 ) + const wxArrayString& choices, + long style, const wxValidator& validator, + const wxString &name ) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; + wxCArrayString chs(choices); + + return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name ); +} - PreCreation( parent, id, pos, size, style, 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 ) +{ + m_blockEvent = false; -#if wxUSE_VALIDATORS - SetValidator( validator ); -#endif + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxListBox creation failed") ); + return false; + } m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); if (style & wxLB_ALWAYS_SB) @@ -262,688 +324,657 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); } - m_list = GTK_LIST( gtk_list_new() ); - GtkSelectionMode mode = GTK_SELECTION_BROWSE; - if (style & wxLB_MULTIPLE) - mode = GTK_SELECTION_MULTIPLE; - else if (style & wxLB_EXTENDED) - mode = GTK_SELECTION_EXTENDED; + GtkScrolledWindowSetBorder(m_widget, style); - gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); + m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) ); -#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 + //wxListBox doesn't have a header :) + //NB: If enabled SetFirstItem doesn't work correctly + gtk_tree_view_set_headers_visible(m_treeview, FALSE); - gtk_widget_show( GTK_WIDGET(m_list) ); +#if wxUSE_CHECKLISTBOX + if(m_hasCheckBoxes) + ((wxCheckListBox*)this)->DoCreateCheckList(); +#endif // wxUSE_CHECKLISTBOX - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 100; - if (newSize.y == -1) newSize.y = 110; - SetSize( newSize.x, newSize.y ); + // Create the data column + gtk_tree_view_insert_column_with_attributes(m_treeview, -1, "", + gtk_cell_renderer_text_new(), + "text", + WXLISTBOX_DATACOLUMN, NULL); - for (int i = 0; i < n; i++) - { - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) 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, + GTK_TYPE_TREE_ENTRY); + else +#endif + m_liststore = gtk_list_store_new(1, GTK_TYPE_TREE_ENTRY); - GtkWidget *list_item; + gtk_tree_view_set_model(m_treeview, GTK_TREE_MODEL(m_liststore)); - wxString str(choices[i]); -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - { - str.Prepend(CHECKBOX_STRING); - } -#endif // wxUSE_CHECKLISTBOX + g_object_unref (m_liststore); //free on treeview destruction - list_item = gtk_list_item_new_with_label( str.mbc_str() ); + // 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); - gtk_container_add( GTK_CONTAINER(m_list), list_item ); + gtk_tree_view_set_enable_search(m_treeview, FALSE); - 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 ); + GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview ); - gtk_signal_connect( GTK_OBJECT(list_item), - "button_press_event", - (GtkSignalFunc)gtk_listbox_button_press_callback, - (gpointer) this ); + g_signal_connect_after (selection, "changed", + G_CALLBACK (gtk_listitem_changed_callback), this); - gtk_signal_connect_after( GTK_OBJECT(list_item), - "button_release_event", - (GtkSignalFunc)gtk_listbox_button_release_callback, - (gpointer) this ); + GtkSelectionMode mode; + if (style & wxLB_MULTIPLE) + { + mode = GTK_SELECTION_MULTIPLE; + } + else if (style & wxLB_EXTENDED) + { + mode = GTK_SELECTION_EXTENDED; + } + else + { + // if style was 0 set single mode + m_windowStyle |= wxLB_SINGLE; + mode = GTK_SELECTION_SINGLE; + } -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - { - gtk_signal_connect( GTK_OBJECT(list_item), - "key_press_event", - (GtkSignalFunc)gtk_listbox_key_press_callback, - (gpointer)this ); - } -#endif // wxUSE_CHECKLISTBOX + gtk_tree_selection_set_mode( selection, mode ); - ConnectWidget( list_item ); + // Handle sortable stuff + if(style & 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); - gtk_widget_show( list_item ); + // 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" + ); } - m_parent->DoAddChild( this ); - PostCreation(); + gtk_container_add (GTK_CONTAINER (m_widget), GTK_WIDGET(m_treeview) ); + + gtk_widget_show( GTK_WIDGET(m_treeview) ); + m_focusWidget = GTK_WIDGET(m_treeview); - SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) ); - SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); + wxListBox::DoInsertItems(wxArrayString(n, choices), 0); // insert initial items - Show( TRUE ); + // generate dclick events + g_signal_connect_after(m_treeview, "row-activated", + G_CALLBACK(gtk_listbox_row_activated_callback), this); + + m_parent->DoAddChild( this ); - return TRUE; + PostCreation(size); + SetInitialSize(size); // need this too because this is a wxControlWithItems + + return true; } wxListBox::~wxListBox() { + m_hasVMT = false; + Clear(); } -void wxListBox::InsertItems(int nItems, const wxString items[], int pos) +// ---------------------------------------------------------------------------- +// adding items +// ---------------------------------------------------------------------------- + +void wxListBox::GtkInsertItems(const wxArrayString& items, + void** clientData, unsigned int pos) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - GList *children = m_list->children; - int length = g_list_length(children); - wxCHECK_RET( pos <= length, _T("invalid index in wxListBox::InsertItems") ); + InvalidateBestSize(); - // 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. + // Create and set column ids and GValues - // first detach the old items - int n; // loop var + unsigned int nNum = items.GetCount(); + unsigned int nCurCount = wxListBox::GetCount(); + wxASSERT_MSG(pos <= nCurCount, wxT("Invalid index passed to wxListBox")); - if ( pos == length ) + GtkTreeIter* pIter = NULL; // append by default + GtkTreeIter iter; + if (pos != nCurCount) { - // no need to do anything complicated - for ( n = 0; n < nItems; n++ ) - { - Append(items[n]); - } + wxCHECK_RET( GtkGetIteratorFor(pos, &iter), + wxT("internal wxListBox error in insertion") ); - return; + pIter = &iter; } - - 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 ) + for (unsigned int i = 0; i < nNum; ++i) { - // save label - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str(GET_REAL_LABEL(label->label),*wxConvCurrent); - 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 ); - } + wxString label = items[i]; - if ( !clientData ) - { - if ( n < (int)m_clientDataList.GetCount() ) - node = m_clientDataList.Nth( n ); - - if ( node ) - { - clientData = node->GetData(); - node = m_clientDataList.Nth( n ); - } - } + GtkTreeEntry* entry = gtk_tree_entry_new(); + gtk_tree_entry_set_label(entry, wxGTK_CONV(label)); + gtk_tree_entry_set_destroy_func(entry, + (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb, + this); - deletedData.Add(clientData); + if (clientData) + gtk_tree_entry_set_userdata(entry, clientData[i]); -#if wxUSE_CHECKLISTBOX - // save check state - if ( m_hasCheckBoxes ) - { - deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n)); - } -#endif // wxUSE_CHECKLISTBOX - } - - 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]); - } + GtkTreeIter itercur; + gtk_list_store_insert_before(m_liststore, &itercur, pIter); - // and append the old items too - pos += nItems; // now the indices are shifter - for ( n = 0; n < nDeletedCount; n++ ) - { - Append(deletedLabels[n], deletedData[n]); + GtkSetItem(itercur, entry); -#if wxUSE_CHECKLISTBOX - if ( m_hasCheckBoxes ) - { - ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]); - } -#endif // wxUSE_CHECKLISTBOX + g_object_unref (entry); } } -void wxListBox::AppendCommon( const wxString &item ) +void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( IsValidInsert(pos), wxT("invalid index in wxListBox::InsertItems") ); - GtkWidget *list_item; + GtkInsertItems(items, NULL, pos); +} - wxString label(item); -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - { - label.Prepend(CHECKBOX_STRING); - } -#endif // wxUSE_CHECKLISTBOX +int wxListBox::DoAppend( const wxString& item ) +{ + wxCHECK_MSG( m_treeview != NULL, -1, wxT("invalid listbox") ); - list_item = gtk_list_item_new_with_label( label.mbc_str() ); + InvalidateBestSize(); - gtk_container_add( GTK_CONTAINER(m_list), list_item ); + GtkTreeEntry* entry = gtk_tree_entry_new(); + gtk_tree_entry_set_label( entry, wxGTK_CONV(item) ); + gtk_tree_entry_set_destroy_func(entry, + (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb, + this); - gtk_signal_connect( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); + GtkTreeIter itercur; + gtk_list_store_insert_before( m_liststore, &itercur, NULL ); - if (HasFlag(wxLB_MULTIPLE)) - gtk_signal_connect( GTK_OBJECT(list_item), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); + GtkSetItem(itercur, entry); - gtk_signal_connect( GTK_OBJECT(list_item), - "button_press_event", - (GtkSignalFunc)gtk_listbox_button_press_callback, - (gpointer) this ); + g_object_unref (entry); - gtk_signal_connect_after( GTK_OBJECT(list_item), - "button_release_event", - (GtkSignalFunc)gtk_listbox_button_release_callback, - (gpointer) this ); + return GtkGetIndexFor(itercur); +} -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - { - gtk_signal_connect( GTK_OBJECT(list_item), - "key_press_event", - (GtkSignalFunc)gtk_listbox_key_press_callback, - (gpointer)this ); - } -#endif // wxUSE_CHECKLISTBOX +void wxListBox::DoSetItems( const wxArrayString& items, + void **clientData) +{ + Clear(); + GtkInsertItems(items, clientData, 0); +} - gtk_widget_show( list_item ); +// ---------------------------------------------------------------------------- +// deleting items +// ---------------------------------------------------------------------------- - ConnectWidget( list_item ); +void wxListBox::Clear() +{ + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - if (GTK_WIDGET_REALIZED(m_widget)) - { - gtk_widget_realize( list_item ); - gtk_widget_realize( GTK_BIN(list_item)->child ); - - if (m_widgetStyle) ApplyWidgetStyle(); - -#if wxUSE_DRAG_AND_DROP -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) m_dropTarget->RegisterWidget( list_item ); -#endif -#endif + InvalidateBestSize(); -#if wxUSE_TOOLTIPS - if (m_tooltip) m_tooltip->Apply( this ); -#endif - } + gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */ } -void wxListBox::Append( const wxString &item ) +void wxListBox::Delete(unsigned int n) { - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) NULL ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - AppendCommon( item ); -} + InvalidateBestSize(); -void wxListBox::Append( const wxString &item, void *clientData ) -{ - m_clientDataList.Append( (wxObject*) clientData ); - m_clientObjectList.Append( (wxObject*) NULL ); + GtkTreeIter iter; + wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("wrong listbox index") ); - AppendCommon( item ); + // 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); } -void wxListBox::Append( const wxString &item, wxClientData *clientData ) +// ---------------------------------------------------------------------------- +// helper functions for working with iterators +// ---------------------------------------------------------------------------- + +bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const { - m_clientObjectList.Append( (wxObject*) clientData ); - m_clientDataList.Append( (wxObject*) NULL ); + 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; + } - AppendCommon( item ); + return true; } -void wxListBox::SetClientData( int n, void* clientData ) +int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + GtkTreePath *path = + gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter); - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return; + gint* pIntPath = gtk_tree_path_get_indices(path); - node->SetData( (wxObject*) clientData ); -} + wxCHECK_MSG( pIntPath, wxNOT_FOUND, _T("failed to get iterator path") ); -void* wxListBox::GetClientData( int n ) -{ - wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") ); + int idx = pIntPath[0]; - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return NULL; + gtk_tree_path_free( path ); - return node->Data(); + return idx; } -void wxListBox::SetClientObject( int n, wxClientData* clientData ) +// get GtkTreeEntry from position (note: you need to g_unref it if valid) +GtkTreeEntry *wxListBox::GtkGetEntry(unsigned n) const { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + GtkTreeIter iter; + if ( !GtkGetIteratorFor(n, &iter) ) + return NULL; + - wxNode *node = m_clientObjectList.Nth( n ); - if (!node) return; + GtkTreeEntry* entry = NULL; + gtk_tree_model_get(GTK_TREE_MODEL(m_liststore), &iter, + WXLISTBOX_DATACOLUMN, &entry, -1); - wxClientData *cd = (wxClientData*) node->Data(); - if (cd) delete cd; + return entry; +} - node->SetData( (wxObject*) clientData ); +void wxListBox::GtkSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry) +{ +#if wxUSE_CHECKLISTBOX + if ( m_hasCheckBoxes ) + { + gtk_list_store_set(m_liststore, &iter, + 0, FALSE, // FALSE == not toggled + 1, entry, + -1); + } + else +#endif // wxUSE_CHECKLISTBOX + { + gtk_list_store_set(m_liststore, &iter, 0, entry, -1); + } } -wxClientData* wxListBox::GetClientObject( int n ) +// ---------------------------------------------------------------------------- +// client data +// ---------------------------------------------------------------------------- + +void* wxListBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, _T("invalid combobox") ); + wxCHECK_MSG( IsValid(n), NULL, + wxT("Invalid index passed to GetItemClientData") ); - wxNode *node = m_clientObjectList.Nth( n ); - if (!node) return (wxClientData*) NULL; + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_MSG(entry, NULL, wxT("could not get entry")); - return (wxClientData*) node->Data(); + void* userdata = gtk_tree_entry_get_userdata( entry ); + g_object_unref (entry); + return userdata; } -void wxListBox::Clear() +wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + return (wxClientData*) wxListBox::DoGetItemClientData(n); +} - gtk_list_clear_items( m_list, 0, Number() ); +void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) +{ + wxCHECK_RET( IsValid(n), + wxT("Invalid index passed to SetItemClientData") ); - wxNode *node = m_clientObjectList.First(); - while (node) - { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - node = node->Next(); - } - m_clientObjectList.Clear(); + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_RET(entry, wxT("could not get entry")); - m_clientDataList.Clear(); + gtk_tree_entry_set_userdata( entry, clientData ); + g_object_unref (entry); } -void wxListBox::Delete( int n ) +void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + // wxItemContainer already deletes data for us + wxListBox::DoSetItemClientData(n, (void*) clientData); +} + +// ---------------------------------------------------------------------------- +// string list access +// ---------------------------------------------------------------------------- - GList *child = g_list_nth( m_list->children, n ); +void wxListBox::SetString(unsigned int n, const wxString& label) +{ + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - wxCHECK_RET( child, _T("wrong listbox index") ); + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_RET( entry, wxT("wrong listbox index") ); - GList *list = g_list_append( (GList*) NULL, child->data ); - gtk_list_remove_items( m_list, list ); - g_list_free( list ); + // update the item itself + gtk_tree_entry_set_label(entry, wxGTK_CONV(label)); - wxNode *node = m_clientObjectList.Nth( n ); - if (node) - { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - m_clientObjectList.DeleteNode( node ); - } + // and update the model which will refresh the tree too + GtkTreeIter iter; + wxCHECK_RET( GtkGetIteratorFor(n, &iter), _T("failed to get iterator") ); - node = m_clientDataList.Nth( n ); - if (node) - { - m_clientDataList.DeleteNode( node ); - } + // FIXME: this resets the checked status of a wxCheckListBox item + + GtkSetItem(iter, entry); } -void wxListBox::Deselect( int n ) +wxString wxListBox::GetString(unsigned int n) const { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") ); + + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") ); + + wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ); - gtk_list_unselect_item( m_list, n ); + g_object_unref (entry); + return label; } -int wxListBox::FindString( const wxString &item ) const +unsigned int wxListBox::GetCount() const { - wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox") ); - GList *child = m_list->children; - int count = 0; - while (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); + return (unsigned int)gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_liststore), NULL); +} - wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); +int wxListBox::FindString( const wxString &item, bool bCase ) const +{ + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); - if (str == item) - return count; + //Sort of hackish - maybe there is a faster way + unsigned int nCount = wxListBox::GetCount(); - count++; - child = child->next; + for(unsigned int i = 0; i < nCount; ++i) + { + 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; } +// ---------------------------------------------------------------------------- +// selection +// ---------------------------------------------------------------------------- + int wxListBox::GetSelection() const { - wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox")); + wxCHECK_MSG( HasFlag(wxLB_SINGLE), wxNOT_FOUND, + wxT("must be single selection 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; + 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); } int wxListBox::GetSelections( wxArrayInt& aSelections ) const { - wxCHECK_MSG( m_list != NULL, -1, _T("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 (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) - count++; - } + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); aSelections.Empty(); - if (count > 0) - { - // now fill the list - aSelections.Alloc(count); // optimization attempt int i = 0; - for (child = m_list->children; child != NULL; child = child->next, i++) + 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_WIDGET(child->data)->state == GTK_STATE_SELECTED) - aSelections.Add(i); - } + 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)); } - return count; + return aSelections.GetCount(); } -wxString wxListBox::GetString( int n ) const +bool wxListBox::IsSelected( int n ) const { - wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, false, wxT("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 = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); - return str; - } - - wxFAIL_MSG(_T("wrong listbox index")); + GtkTreeIter iter; + wxCHECK_MSG( GtkGetIteratorFor(n, &iter), false, wxT("Invalid index") ); - return _T(""); + return gtk_tree_selection_iter_is_selected(selection, &iter); } -wxString wxListBox::GetStringSelection() const +void wxListBox::DoSetSelection( int n, bool select ) { - wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") ); - - GList *selection = m_list->selection; - if (selection) + // passing -1 to SetSelection() is documented to deselect all items + if ( n == wxNOT_FOUND ) { - GtkBin *bin = GTK_BIN( selection->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); - - return str; + // ... and not generate any events in the process + GtkDeselectAll(); + return; } - wxFAIL_MSG(_T("no listbox selection available")); - return _T(""); + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") ); + + // don't generate the selection event + GtkSetSelection(n, select, true); } -int wxListBox::Number() +void wxListBox::GtkDeselectAll() { - wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - GList *child = m_list->children; - int count = 0; - while (child) { count++; child = child->next; } - return count; -} + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); -bool wxListBox::Selected( int n ) -{ - wxCHECK_MSG( m_list != NULL, FALSE, _T("invalid listbox") ); + m_blockEvent = true; - GList *target = g_list_nth( m_list->children, n ); - if (target) - { - GList *child = m_list->selection; - while (child) - { - if (child->data == target->data) return TRUE; - child = child->next; - } - } - wxFAIL_MSG(_T("wrong listbox index")); - return FALSE; -} + gtk_tree_selection_unselect_all(selection); -void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) ) -{ - wxFAIL_MSG(_T("wxListBox::Set not implemented")); + m_blockEvent = false; } -void wxListBox::SetFirstItem( int WXUNUSED(n) ) +void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent) { - wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented")); -} + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); -void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) ) -{ - wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented")); -} + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); -void wxListBox::SetSelection( int n, bool select ) -{ - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + GtkTreeIter iter; + wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("Invalid index") ); + + m_blockEvent = blockEvent; if (select) - gtk_list_select_item( m_list, n ); + gtk_tree_selection_select_iter(selection, &iter); else - gtk_list_unselect_item( m_list, n ); + gtk_tree_selection_unselect_iter(selection, &iter); + + m_blockEvent = false; } -void wxListBox::SetString( int n, const wxString &string ) +void wxListBox::DoSetFirstItem( int n ) { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + wxCHECK_RET( m_treeview, wxT("invalid listbox") ); + wxCHECK_RET( IsValid(n), wxT("invalid index")); - GList *child = g_list_nth( m_list->children, n ); - if (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); + //RN: I have no idea why this line is needed... + if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_treeview)) + return; - wxString str; -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - str += CHECKBOX_STRING; -#endif // wxUSE_CHECKLISTBOX - str += string; + GtkTreeIter iter; + if ( !GtkGetIteratorFor(n, &iter) ) + return; - gtk_label_set( label, str.mbc_str() ); - } - else - { - wxFAIL_MSG(_T("wrong listbox index")); - } -} + GtkTreePath* path = gtk_tree_model_get_path( + GTK_TREE_MODEL(m_liststore), &iter); -void wxListBox::SetStringSelection( const wxString &string, bool select ) -{ - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); + // Scroll to the desired cell (0.0 == topleft alignment) + gtk_tree_view_scroll_to_cell(m_treeview, path, NULL, + TRUE, 0.0f, 0.0f); - SetSelection( FindString(string), select ); + gtk_tree_path_free(path); } -int wxListBox::GetIndex( GtkWidget *item ) const +// ---------------------------------------------------------------------------- +// hittest +// ---------------------------------------------------------------------------- + +int wxListBox::DoListHitTest(const wxPoint& point) const { - if (item) + // 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, 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 + ) ) { - GList *child = m_list->children; - int count = 0; - while (child) - { - if (GTK_WIDGET(child->data) == item) return count; - count++; - child = child->next; - } + return wxNOT_FOUND; } - return -1; + + int index = gtk_tree_path_get_indices(path)[0]; + gtk_tree_path_free(path); + + return index; } +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- + #if wxUSE_TOOLTIPS -void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) +void wxListBox::ApplyToolTip( GtkTooltips *tips, const gchar *tip ) { - GList *child = m_list->children; - while (child) - { - gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvLocal.cWX2MB(tip), (gchar*) NULL ); - child = child->next; - } + // RN: Is this needed anymore? + gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, (gchar*) NULL ); } #endif // wxUSE_TOOLTIPS -#if wxUSE_DRAG_AND_DROP -void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) +GtkWidget *wxListBox::GetConnectWidget() { - wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); - -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) - { - GList *child = m_list->children; - while (child) - { - m_dropTarget->UnregisterWidget( GTK_WIDGET( child->data ) ); - child = child->next; - } - } -#endif + // 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); +} - wxWindow::SetDropTarget( dropTarget ); +GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const +{ + return gtk_tree_view_get_bin_window(m_treeview); +} -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) +void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) +{ + if (m_hasBgCol && m_backgroundColour.Ok()) { - GList *child = m_list->children; - while (child) + GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview); + if (window) { - m_dropTarget->RegisterWidget( 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 -} -#endif -GtkWidget *wxListBox::GetConnectWidget() -{ - return GTK_WIDGET(m_list); + gtk_widget_modify_style( GTK_WIDGET(m_treeview), style ); } -bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) +wxSize wxListBox::DoGetBestSize() const { - if (wxWindow::IsOwnGtkWindow( window )) return TRUE; + wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view")); - GList *child = m_list->children; - while (child) + // Start with a minimum size that's not too small + int cx, cy; + GetTextExtent( wxT("X"), &cx, &cy); + int lbWidth = 3 * cx; + int lbHeight = 10; + + // Get the visible area of the tree view (limit to the 10th item + // so that it isn't too big) + unsigned int count = GetCount(); + if (count) { - GtkWidget *bin = GTK_WIDGET( child->data ); - if (bin->window == window) return TRUE; - child = child->next; - } + int wLine; - return FALSE; -} + // Find the widest line + for(unsigned int i = 0; i < count; i++) { + wxString str(GetString(i)); + GetTextExtent(str, &wLine, NULL); + lbWidth = wxMax(lbWidth, wLine); + } -void wxListBox::ApplyWidgetStyle() -{ - SetWidgetStyle(); + lbWidth += 3 * cx; - if (m_backgroundColour.Ok()) - { - GdkWindow *window = GTK_WIDGET(m_list)->window; - if ( window ) + // And just a bit more for the checkbox if present and then some + // (these are rough guesses) +#if wxUSE_CHECKLISTBOX + if ( m_hasCheckBoxes ) { - m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); - gdk_window_set_background( window, m_backgroundColour.GetColor() ); - gdk_window_clear( window ); + lbWidth += 35; + cy = cy > 25 ? cy : 25; // rough height of checkbox } +#endif + + // don't make the listbox too tall (limit height to around 10 items) but don't + // make it too small neither + lbHeight = (cy+4) * wxMin(wxMax(count, 3), 10); } - GList *child = m_list->children; - while (child) - { - gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle ); + // Add room for the scrollbar + lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); - GtkBin *bin = GTK_BIN( child->data ); - GtkWidget *label = GTK_WIDGET( bin->child ); - gtk_widget_set_style( label, m_widgetStyle ); + wxSize best(lbWidth, lbHeight); + CacheBestSize(best); + return best; +} - child = child->next; - } +// static +wxVisualAttributes +wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new, true); } -#endif \ No newline at end of file +#endif // wxUSE_LISTBOX