X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53bad206de0ead56a4cecad5c0f38a8fb0c55ae1..a5fb925380c924f2e34dd3de0dc2fa8bb2391ee3:/src/gtk/listbox.cpp?ds=sidebyside diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 9339a6dedf..b4fa72e371 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -1,345 +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" + #include "wx/tooltip.h" #endif -#include #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 - -// checklistboxes have "[±] " prepended to their lables, this macro removes it -// (NB: 4 below is the length of wxCHECKLBOX_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; -extern wxCursor g_globalCursor; - -static bool g_hasDoubleClicked = FALSE; +#define WXLISTBOX_DATACOLUMN WXLISTBOX_DATACOLUMN_ARG(this) //----------------------------------------------------------------------------- -// idle callback for SetFirstItem +// "row-activated" //----------------------------------------------------------------------------- -struct wxlistbox_idle_struct +extern "C" { +static void +gtk_listbox_row_activated_callback(GtkTreeView *treeview, + GtkTreePath *path, + GtkTreeViewColumn *col, + wxListBox *listbox) { - wxListBox *m_listbox; - int m_item; - gint m_tag; -}; - -static gint wxlistbox_idle_callback( gpointer gdata ) -{ - wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata; - gdk_threads_enter(); - - gtk_idle_remove( data->m_tag ); - - data->m_listbox->SetFirstItem( data->m_item ); - - delete data; - - gdk_threads_leave(); - - return TRUE; -} - -//----------------------------------------------------------------------------- -// "button_release_event" -//----------------------------------------------------------------------------- + if (g_blockEventsOnDrag) return; + if (g_blockEventsOnScroll) return; -/* 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 */ + // This is triggered by either a double-click or a space press -static gint -gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget), - GdkEventButton * WXUNUSED(gdk_event), - wxListBox *listbox ) -{ - if (g_isIdle) wxapp_install_idle_handler(); + int sel = gtk_tree_path_get_indices(path)[0]; - if (g_blockEventsOnDrag) return FALSE; - if (g_blockEventsOnScroll) return FALSE; + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); + event.SetEventObject( listbox ); - if (!listbox->m_hasVMT) return FALSE; + if (listbox->IsSelected(sel)) + { + GtkTreeEntry* entry = listbox->GtkGetEntry(sel); - if (!g_hasDoubleClicked) return FALSE; + if (entry) + { + event.SetInt(sel); + event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry))); - wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); - event.SetEventObject( listbox ); + if ( listbox->HasClientObjectData() ) + event.SetClientObject( (wxClientData*) gtk_tree_entry_get_userdata(entry) ); + else if ( listbox->HasClientUntypedData() ) + event.SetClientData( gtk_tree_entry_get_userdata(entry) ); - wxArrayInt aSelections; - int n, count = listbox->GetSelections(aSelections); - if ( count > 0 ) - { - n = aSelections[0]; - if ( listbox->HasClientObjectData() ) - event.SetClientObject( listbox->GetClientObject(n) ); - else if ( listbox->HasClientUntypedData() ) - event.SetClientData( listbox->GetClientData(n) ); - event.SetString( listbox->GetString(n) ); + g_object_unref (entry); + } + else + { + wxLogSysError(wxT("Internal error - could not get entry for double-click")); + event.SetInt(-1); + } } else { - n = -1; + event.SetInt(-1); } - event.m_commandInt = n; - listbox->GetEventHandler()->ProcessEvent( event ); - - return FALSE; +} } //----------------------------------------------------------------------------- -// "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->GtkGetIndex( 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 ); - clb->Check( sel, !clb->IsChecked(sel) ); - - wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); - event.SetEventObject( listbox ); - event.SetInt( sel ); - listbox->GetEventHandler()->ProcessEvent( event ); - } -#endif // wxUSE_CHECKLISTBOX - - /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */ - g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS); - - return FALSE; -} + if (selections.GetCount() == 0) + { + // indicate that this is a deselection + event.SetExtraLong( 0 ); + event.SetInt( -1 ); -//----------------------------------------------------------------------------- -// "key_press_event" -//----------------------------------------------------------------------------- + listbox->GetEventHandler()->ProcessEvent( event ); -static gint -gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); + return; + } + else + { + // indicate that this is a selection + event.SetExtraLong( 1 ); + event.SetInt( selections[0] ); - if (g_blockEventsOnDrag) - return FALSE; + listbox->GetEventHandler()->ProcessEvent( event ); + } + } + else + { + int index = listbox->GetSelection(); + if (index == wxNOT_FOUND) + { + // indicate that this is a deselection + event.SetExtraLong( 0 ); + event.SetInt( -1 ); - bool ret = FALSE; + listbox->GetEventHandler()->ProcessEvent( event ); - if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) - { - wxNavigationKeyEvent new_event; - /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */ - new_event.SetDirection( (gdk_event->keyval == GDK_Tab) ); - /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ - new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) ); - new_event.SetCurrentFocus( listbox ); - ret = listbox->GetEventHandler()->ProcessEvent( new_event ); - } + return; + } + else + { + GtkTreeEntry* entry = listbox->GtkGetEntry( index ); - if ((gdk_event->keyval == GDK_Return) && (!ret)) - { - // eat return in all modes - ret = TRUE; - } - -#if wxUSE_CHECKLISTBOX - if ((gdk_event->keyval == ' ') && (listbox->m_hasCheckBoxes) && (!ret)) - { - int sel = listbox->GtkGetIndex( widget ); + // indicate that this is a selection + event.SetExtraLong( 1 ); - wxCheckListBox *clb = (wxCheckListBox *)listbox; + event.SetInt( index ); + event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry))); - clb->Check( sel, !clb->IsChecked(sel) ); + if ( listbox->HasClientObjectData() ) + event.SetClientObject( + (wxClientData*) gtk_tree_entry_get_userdata(entry) + ); + else if ( listbox->HasClientUntypedData() ) + event.SetClientData( gtk_tree_entry_get_userdata(entry) ); - wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); - new_event.SetEventObject( listbox ); - new_event.SetInt( sel ); - ret = listbox->GetEventHandler()->ProcessEvent( new_event ); - } -#endif // wxUSE_CHECKLISTBOX + listbox->GetEventHandler()->ProcessEvent( event ); - if (ret) - { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); - return TRUE; + g_object_unref (entry); + } } - - return FALSE; +} } //----------------------------------------------------------------------------- -// "select" and "deselect" +// GtkTreeEntry destruction (to destroy client data) //----------------------------------------------------------------------------- -static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection ); - -static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox ) +extern "C" { +static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry, + wxListBox* listbox) { - gtk_listitem_select_cb( widget, listbox, TRUE ); + if (listbox->HasClientObjectData()) + { + gpointer userdata = gtk_tree_entry_get_userdata(entry); + if (userdata) + delete (wxClientData *)userdata; + } } - -static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox ) -{ - gtk_listitem_select_cb( widget, listbox, FALSE ); } -static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection ) +//----------------------------------------------------------------------------- +// Sorting callback (standard CmpNoCase return value) +//----------------------------------------------------------------------------- +#include + +extern "C" { +static gint gtk_listbox_sort_callback(GtkTreeModel *model, + GtkTreeIter *a, + GtkTreeIter *b, + wxListBox *listbox) { - if (g_isIdle) wxapp_install_idle_handler(); + GtkTreeEntry* entry; + GtkTreeEntry* entry2; - if (!listbox->m_hasVMT) return; - if (g_blockEventsOnDrag) return; + 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")); - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); - event.SetEventObject( listbox ); -// MSW doesn't do that either -// event.SetExtraLong( (long) is_selection ); + //We compare collate keys here instead of calling g_utf8_collate + //as it is rather slow (and even the docs reccommend this) + int ret = strcmp(gtk_tree_entry_get_collate_key(entry), + gtk_tree_entry_get_collate_key(entry2)); + g_object_unref (entry); + g_object_unref (entry2); - if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0) - { - int sel = listbox->GtkGetIndex( widget ); + return ret; +} +} - if (listbox->m_prevSelection != sel) - gtk_list_unselect_item( listbox->m_list, listbox->m_prevSelection ); +//----------------------------------------------------------------------------- +// Searching callback (TRUE == not equal, FALSE == equal) +//----------------------------------------------------------------------------- - listbox->m_prevSelection = sel; - } +extern "C" { +static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model, + gint column, + const gchar* key, + GtkTreeIter* iter, + wxListBox* listbox) +{ + GtkTreeEntry* entry; - wxArrayInt aSelections; - int n, count = listbox->GetSelections(aSelections); - if ( count > 0 ) - { - n = aSelections[0]; - if ( listbox->HasClientObjectData() ) - event.SetClientObject( listbox->GetClientObject(n) ); - else if ( listbox->HasClientUntypedData() ) - event.SetClientData( listbox->GetClientData(n) ); - event.SetString( listbox->GetString(n) ); - } - else - { - n = -1; - } + 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)); - event.m_commandInt = n; + int ret = strcmp(keycollatekey, + gtk_tree_entry_get_collate_key(entry)); -// No longer required with new code in wxLB_SINGLE -// listbox->GetEventHandler()->AddPendingEvent( event ); - listbox->GetEventHandler()->ProcessEvent( event ); + g_object_unref (entry); + + return ret != 0; +} } //----------------------------------------------------------------------------- // wxListBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) // ---------------------------------------------------------------------------- // 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, + 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 ) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; - m_prevSelection = 0; // or -1 ?? + m_blockEvent = false; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxListBox creation failed") ); - return FALSE; + return false; } m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); @@ -354,7 +325,58 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); } - m_list = GTK_LIST( gtk_list_new() ); + + GtkScrolledWindowSetBorder(m_widget, style); + + m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) ); + + //wxListBox doesn't have a header :) + //NB: If enabled SetFirstItem doesn't work correctly + gtk_tree_view_set_headers_visible(m_treeview, FALSE); + +#if wxUSE_CHECKLISTBOX + if(m_hasCheckBoxes) + ((wxCheckListBox*)this)->DoCreateCheckList(); +#endif // wxUSE_CHECKLISTBOX + + // 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, + GTK_TYPE_TREE_ENTRY); + else +#endif + m_liststore = gtk_list_store_new(1, GTK_TYPE_TREE_ENTRY); + + gtk_tree_view_set_model(m_treeview, GTK_TREE_MODEL(m_liststore)); + + g_object_unref (m_liststore); //free on treeview destruction + + // 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_tree_view_set_enable_search(m_treeview, FALSE); + + + GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview ); + + g_signal_connect_after (selection, "changed", + G_CALLBACK (gtk_listitem_changed_callback), this); GtkSelectionMode mode; if (style & wxLB_MULTIPLE) @@ -369,243 +391,189 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, { // if style was 0 set single mode m_windowStyle |= wxLB_SINGLE; - mode = GTK_SELECTION_MULTIPLE; + mode = GTK_SELECTION_SINGLE; } - gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); + gtk_tree_selection_set_mode( selection, 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 - - /* make list scroll when moving the focus down using cursor keys */ - gtk_container_set_focus_vadjustment( - GTK_CONTAINER(m_list), - gtk_scrolled_window_get_vadjustment( - GTK_SCROLLED_WINDOW(m_widget))); + // 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); - gtk_widget_show( GTK_WIDGET(m_list) ); + // 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" + ); + } - SetBestSize( size ); - if ( style & wxLB_SORT ) - { - // this will change DoAppend() behaviour - m_strings = new wxSortedArrayString; - } - else - { - m_strings = (wxSortedArrayString *)NULL; - } + gtk_container_add (GTK_CONTAINER (m_widget), GTK_WIDGET(m_treeview) ); - for (int i = 0; i < n; i++) - { - // add one by one - DoAppend(choices[i]); - } + gtk_widget_show( GTK_WIDGET(m_treeview) ); + m_focusWidget = GTK_WIDGET(m_treeview); - m_parent->DoAddChild( this ); + Append(n, choices); // insert initial items - PostCreation(); + // generate dclick events + g_signal_connect_after(m_treeview, "row-activated", + G_CALLBACK(gtk_listbox_row_activated_callback), this); - SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) ); - SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); + m_parent->DoAddChild( this ); - Show( TRUE ); + PostCreation(size); + SetInitialSize(size); // need this too because this is a wxControlWithItems - return TRUE; + return true; } wxListBox::~wxListBox() { - m_hasVMT = FALSE; + m_hasVMT = false; Clear(); - - if (m_strings) - delete m_strings; } -void wxListBox::DoInsertItems(const wxArrayString& items, int pos) +// ---------------------------------------------------------------------------- +// adding items +// ---------------------------------------------------------------------------- + +int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, + wxClientDataType type) { - wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); - // VZ: notice that InsertItems knows nothing about sorting, so calling it - // from outside (and not from our own Append) is likely to break - // everything + InvalidateBestSize(); - // code elsewhere supposes we have as many items in m_clientList as items - // in the listbox - wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(), - wxT("bug in client data management") ); + GtkTreeIter* pIter = NULL; // append by default + GtkTreeIter iter; + if ( pos != GetCount() ) + { + wxCHECK_MSG( GtkGetIteratorFor(pos, &iter), wxNOT_FOUND, + wxT("internal wxListBox error in insertion") ); - GList *children = m_list->children; - int length = g_list_length(children); + pIter = &iter; + } - wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") ); + const unsigned int numItems = items.GetCount(); + for ( unsigned int i = 0; i < numItems; ++i ) + { + GtkTreeEntry* entry = gtk_tree_entry_new(); + gtk_tree_entry_set_label(entry, wxGTK_CONV(items[i])); + gtk_tree_entry_set_destroy_func(entry, + (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb, + this); - size_t nItems = items.GetCount(); - int index; + if (clientData) + gtk_tree_entry_set_userdata(entry, clientData[i]); - if (m_strings) - { - for (size_t n = 0; n < nItems; n++) - { - index = m_strings->Add( items[n] ); - - if (index != GetCount()) - { - GtkAddItem( items[n], index ); - wxNode *node = m_clientList.Nth( index ); - m_clientList.Insert( node, (wxObject*) NULL ); - } - else - { - GtkAddItem( items[n] ); - m_clientList.Append( (wxObject*) NULL ); - } - } - } - else - { - if (pos == length) - { - for ( size_t n = 0; n < nItems; n++ ) - { - GtkAddItem( items[n] ); + GtkTreeIter itercur; + gtk_list_store_insert_before(m_liststore, &itercur, pIter); - m_clientList.Append((wxObject *)NULL); - } - } - else - { - wxNode *node = m_clientList.Nth( pos ); - for ( size_t n = 0; n < nItems; n++ ) - { - GtkAddItem( items[n], pos+n ); + GtkSetItem(itercur, entry); - m_clientList.Insert( node, (wxObject *)NULL ); - } - } + g_object_unref (entry); } - wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(), - wxT("bug in client data management") ); + return pos + numItems - 1; } -int wxListBox::DoAppend( const wxString& item ) +// ---------------------------------------------------------------------------- +// deleting items +// ---------------------------------------------------------------------------- + +void wxListBox::DoClear() { - if (m_strings) - { - // need to determine the index - int index = m_strings->Add( item ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - // only if not at the end anyway - if (index != GetCount()) - { - GtkAddItem( item, index ); + InvalidateBestSize(); - wxNode *node = m_clientList.Nth( index ); - m_clientList.Insert( node, (wxObject *)NULL ); + gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */ +} - return index; - } - } +void wxListBox::DoDeleteOneItem(unsigned int n) +{ + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - GtkAddItem(item); + InvalidateBestSize(); - m_clientList.Append((wxObject *)NULL); + GtkTreeIter iter; + wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("wrong listbox index") ); - return GetCount() - 1; + // 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::GtkAddItem( const wxString &item, int pos ) -{ - wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); - - GtkWidget *list_item; +// ---------------------------------------------------------------------------- +// helper functions for working with iterators +// ---------------------------------------------------------------------------- - wxString label(item); -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) +bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const +{ + if ( !gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_liststore), + iter, NULL, pos) ) { - label.Prepend(wxCHECKLBOX_STRING); + wxLogDebug(wxT("gtk_tree_model_iter_nth_child(%u) failed"), pos); + return false; } -#endif // wxUSE_CHECKLISTBOX - - list_item = gtk_list_item_new_with_label( label.mbc_str() ); - - GList *gitem_list = g_list_alloc (); - gitem_list->data = list_item; - if (pos == -1) - gtk_list_append_items( GTK_LIST (m_list), gitem_list ); - else - gtk_list_insert_items( GTK_LIST (m_list), gitem_list, pos ); + return true; +} - gtk_signal_connect( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); +int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const +{ + GtkTreePath *path = + gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter); - if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED)) - gtk_signal_connect( GTK_OBJECT(list_item), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); + gint* pIntPath = gtk_tree_path_get_indices(path); - gtk_signal_connect( GTK_OBJECT(list_item), - "button_press_event", - (GtkSignalFunc)gtk_listbox_button_press_callback, - (gpointer) this ); + wxCHECK_MSG( pIntPath, wxNOT_FOUND, _T("failed to get iterator path") ); - gtk_signal_connect_after( GTK_OBJECT(list_item), - "button_release_event", - (GtkSignalFunc)gtk_listbox_button_release_callback, - (gpointer) this ); + int idx = pIntPath[0]; - gtk_signal_connect( GTK_OBJECT(list_item), - "key_press_event", - (GtkSignalFunc)gtk_listbox_key_press_callback, - (gpointer)this ); + gtk_tree_path_free( path ); - ConnectWidget( list_item ); + return idx; +} - gtk_widget_show( list_item ); +// get GtkTreeEntry from position (note: you need to g_unref it if valid) +GtkTreeEntry *wxListBox::GtkGetEntry(unsigned n) const +{ + GtkTreeIter iter; + if ( !GtkGetIteratorFor(n, &iter) ) + return NULL; - if (GTK_WIDGET_REALIZED(m_widget)) - { - gtk_widget_realize( list_item ); - gtk_widget_realize( GTK_BIN(list_item)->child ); - // Apply current widget style to the new list_item - if (m_widgetStyle) - { - gtk_widget_set_style( GTK_WIDGET( list_item ), m_widgetStyle ); - GtkBin *bin = GTK_BIN( list_item ); - GtkWidget *label = GTK_WIDGET( bin->child ); - gtk_widget_set_style( label, m_widgetStyle ); - } + GtkTreeEntry* entry = NULL; + gtk_tree_model_get(GTK_TREE_MODEL(m_liststore), &iter, + WXLISTBOX_DATACOLUMN, &entry, -1); -#if wxUSE_TOOLTIPS - if (m_tooltip) m_tooltip->Apply( this ); -#endif - } + return entry; } -void wxListBox::DoSetItems( const wxArrayString& items, - void **clientData) +void wxListBox::GtkSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry) { - Clear(); - - DoInsertItems(items, 0); - - if ( clientData ) +#if wxUSE_CHECKLISTBOX + if ( m_hasCheckBoxes ) { - size_t count = items.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - SetClientData(n, clientData[n]); - } + 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); } } @@ -613,447 +581,351 @@ void wxListBox::DoSetItems( const wxArrayString& items, // client data // ---------------------------------------------------------------------------- -void wxListBox::DoSetItemClientData( int n, void* clientData ) +void* wxListBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); + wxCHECK_MSG( IsValid(n), NULL, + wxT("Invalid index passed to GetItemClientData") ); - wxNode *node = m_clientList.Nth( n ); - wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") ); + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_MSG(entry, NULL, wxT("could not get entry")); - node->SetData( (wxObject*) clientData ); + void* userdata = gtk_tree_entry_get_userdata( entry ); + g_object_unref (entry); + return userdata; } -void* wxListBox::DoGetItemClientData( int n ) const +void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) { - wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") ); + wxCHECK_RET( IsValid(n), + wxT("Invalid index passed to SetItemClientData") ); - wxNode *node = m_clientList.Nth( n ); - wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") ); + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_RET(entry, wxT("could not get entry")); - return node->Data(); + gtk_tree_entry_set_userdata( entry, clientData ); + g_object_unref (entry); } -void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); +// ---------------------------------------------------------------------------- +// string list access +// ---------------------------------------------------------------------------- - wxNode *node = m_clientList.Nth( n ); - wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") ); +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") ); - wxClientData *cd = (wxClientData*) node->Data(); - delete cd; + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_RET( entry, wxT("wrong listbox index") ); - node->SetData( (wxObject*) clientData ); -} + // update the item itself + gtk_tree_entry_set_label(entry, wxGTK_CONV(label)); -wxClientData* wxListBox::DoGetItemClientObject( int n ) const -{ - wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") ); + // and update the model which will refresh the tree too + GtkTreeIter iter; + wxCHECK_RET( GtkGetIteratorFor(n, &iter), _T("failed to get iterator") ); - wxNode *node = m_clientList.Nth( n ); - wxCHECK_MSG( node, (wxClientData *)NULL, - wxT("invalid index in wxListBox::DoGetItemClientObject") ); + // FIXME: this resets the checked status of a wxCheckListBox item - return (wxClientData*) node->Data(); + GtkSetItem(iter, entry); } -void wxListBox::Clear() +wxString wxListBox::GetString(unsigned int n) const { - wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") ); - gtk_list_clear_items( m_list, 0, GetCount() ); + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") ); - if ( HasClientObjectData() ) - { - // destroy the data (due to Robert's idea of using wxList - // and not wxList we can't just say - // m_clientList.DeleteContents(TRUE) - this would crash! - wxNode *node = m_clientList.First(); - while ( node ) - { - delete (wxClientData *)node->Data(); - node = node->Next(); - } - } - m_clientList.Clear(); + wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ); - if ( m_strings ) - m_strings->Clear(); + g_object_unref (entry); + return label; } -void wxListBox::Delete( int n ) +unsigned int wxListBox::GetCount() const { - wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox") ); - GList *child = g_list_nth( m_list->children, n ); + return (unsigned int)gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_liststore), NULL); +} - wxCHECK_RET( child, wxT("wrong listbox index") ); +int wxListBox::FindString( const wxString &item, bool bCase ) const +{ + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); - GList *list = g_list_append( (GList*) NULL, child->data ); - gtk_list_remove_items( m_list, list ); - g_list_free( list ); + //Sort of hackish - maybe there is a faster way + unsigned int nCount = wxListBox::GetCount(); - wxNode *node = m_clientList.Nth( n ); - if ( node ) + for(unsigned int i = 0; i < nCount; ++i) { - if ( m_clientDataItemsType == wxClientData_Object ) - { - wxClientData *cd = (wxClientData*)node->Data(); - delete cd; - } - - m_clientList.DeleteNode( node ); + if( item.IsSameAs( wxListBox::GetString(i), bCase ) ) + return (int)i; } - if ( m_strings ) - m_strings->Remove(n); + + // it's not an error if the string is not found -> no wxCHECK + return wxNOT_FOUND; } // ---------------------------------------------------------------------------- -// string list access +// selection // ---------------------------------------------------------------------------- -void wxListBox::SetString( int n, const wxString &string ) +int wxListBox::GetSelection() const { - wxCHECK_RET( m_list != NULL, wxT("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 = g_list_nth( m_list->children, n ); - if (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); + GtkTreeIter iter; + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); - wxString str; -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - str += wxCHECKLBOX_STRING; -#endif // wxUSE_CHECKLISTBOX - str += string; + // only works on single-sel + if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) + return wxNOT_FOUND; - gtk_label_set( label, str.mbc_str() ); - } - else - { - wxFAIL_MSG(wxT("wrong listbox index")); - } + return GtkGetIndexFor(iter); } -wxString wxListBox::GetString( int n ) const +int wxListBox::GetSelections( wxArrayInt& aSelections ) const { - wxCHECK_MSG( m_list != NULL, wxT(""), 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 ); + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); - wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); - - return str; - } + aSelections.Empty(); - wxFAIL_MSG(wxT("wrong listbox index")); + int i = 0; + GtkTreeIter iter; + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); - return wxT(""); -} + 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); -int wxListBox::GetCount() const -{ - wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); + i++; + } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(m_liststore), &iter)); + } - GList *children = m_list->children; - return g_list_length(children); + return aSelections.GetCount(); } -int wxListBox::FindString( const wxString &item ) const +bool wxListBox::IsSelected( int n ) const { - wxCHECK_MSG( m_list != NULL, -1, 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 ); - - wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); + wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid listbox") ); - if (str == item) - return count; + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); - count++; - child = child->next; - } - - // it's not an error if the string is not found -> no wxCHECK + GtkTreeIter iter; + wxCHECK_MSG( GtkGetIteratorFor(n, &iter), false, wxT("Invalid index") ); - return wxNOT_FOUND; + return gtk_tree_selection_iter_is_selected(selection, &iter); } -// ---------------------------------------------------------------------------- -// selection -// ---------------------------------------------------------------------------- - -int wxListBox::GetSelection() const +void wxListBox::DoSetSelection( int n, bool select ) { - wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); - - GList *child = m_list->children; - int count = 0; - while (child) + // passing -1 to SetSelection() is documented to deselect all items + if ( n == wxNOT_FOUND ) { - if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) return count; - count++; - child = child->next; + // ... and not generate any events in the process + GtkDeselectAll(); + return; } - return -1; + + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") ); + + // don't generate the selection event + GtkSetSelection(n, select, true); } -int wxListBox::GetSelections( wxArrayInt& aSelections ) const +void wxListBox::GtkDeselectAll() { - wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); + wxCHECK_RET( m_treeview != NULL, wxT("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++; - } + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); - aSelections.Empty(); + m_blockEvent = true; - 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++) - { - if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) - aSelections.Add(i); - } - } + gtk_tree_selection_unselect_all(selection); - return count; + m_blockEvent = false; } -bool wxListBox::IsSelected( int n ) const +void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent) { - wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") ); - - GList *target = g_list_nth( m_list->children, n ); - - wxCHECK_MSG( target, FALSE, wxT("invalid listbox index") ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ; -} + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); -void wxListBox::SetSelection( int n, bool select ) -{ - wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + GtkTreeIter iter; + wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("Invalid index") ); - GtkDisableEvents(); + m_blockEvent = blockEvent; if (select) - { - if ((m_windowStyle & wxLB_SINGLE) != 0) - gtk_list_unselect_item( m_list, m_prevSelection ); - gtk_list_select_item( m_list, n ); - m_prevSelection = n; - } + gtk_tree_selection_select_iter(selection, &iter); else - gtk_list_unselect_item( m_list, n ); + gtk_tree_selection_unselect_iter(selection, &iter); - GtkEnableEvents(); + m_blockEvent = false; } void wxListBox::DoSetFirstItem( int n ) { - wxCHECK_RET( m_list, wxT("invalid listbox") ); + wxCHECK_RET( m_treeview, wxT("invalid listbox") ); + wxCHECK_RET( IsValid(n), wxT("invalid index")); - if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_list)) + //RN: I have no idea why this line is needed... + if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_treeview)) return; - - // terribly efficient - const gchar *vadjustment_key = "gtk-vadjustment"; - guint vadjustment_key_id = g_quark_from_static_string (vadjustment_key); - - GtkAdjustment *adjustment = - (GtkAdjustment*) gtk_object_get_data_by_id (GTK_OBJECT (m_list), vadjustment_key_id); - wxCHECK_RET( adjustment, wxT("invalid listbox code") ); - - GList *target = g_list_nth( m_list->children, n ); - wxCHECK_RET( target, wxT("invalid listbox index") ); - - GtkWidget *item = GTK_WIDGET(target->data); - wxCHECK_RET( item, wxT("invalid listbox code") ); - - if (item->allocation.y == -1) - { - wxlistbox_idle_struct* data = new wxlistbox_idle_struct; - data->m_listbox = this; - data->m_item = n; - data->m_tag = gtk_idle_add_priority( 800, wxlistbox_idle_callback, (gpointer) data ); - + + GtkTreeIter iter; + if ( !GtkGetIteratorFor(n, &iter) ) return; - } - float y = item->allocation.y; - if (y > adjustment->upper - adjustment->page_size) - y = adjustment->upper - adjustment->page_size; - gtk_adjustment_set_value( adjustment, y ); + 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, 0.0f, 0.0f); + + gtk_tree_path_free(path); } // ---------------------------------------------------------------------------- -// helpers +// hittest // ---------------------------------------------------------------------------- -int wxListBox::GtkGetIndex( GtkWidget *item ) const +int wxListBox::DoListHitTest(const wxPoint& point) 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; -} + // 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; -#if wxUSE_TOOLTIPS -void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) -{ - GList *child = m_list->children; - while (child) - { - gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), (gchar*) NULL ); - child = child->next; - } -} -#endif // wxUSE_TOOLTIPS + // 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); -void wxListBox::GtkDisableEvents() -{ - GList *child = m_list->children; - while (child) + 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 + ) ) { - gtk_signal_disconnect_by_func( GTK_OBJECT(child->data), - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); + return wxNOT_FOUND; + } - if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED)) - gtk_signal_disconnect_by_func( GTK_OBJECT(child->data), - GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); + int index = gtk_tree_path_get_indices(path)[0]; + gtk_tree_path_free(path); - child = child->next; - } + return index; } -void wxListBox::GtkEnableEvents() -{ - GList *child = m_list->children; - while (child) - { - gtk_signal_connect( GTK_OBJECT(child->data), "select", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - - if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED)) - gtk_signal_connect( GTK_OBJECT(child->data), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- - child = child->next; - } +#if wxUSE_TOOLTIPS +void wxListBox::ApplyToolTip( GtkTooltips *tips, const gchar *tip ) +{ + // RN: Is this needed anymore? + gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, (gchar*) NULL ); } +#endif // wxUSE_TOOLTIPS GtkWidget *wxListBox::GetConnectWidget() { - return GTK_WIDGET(m_list); + // 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); } -bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - if (GTK_WIDGET(m_list)->window == window) return TRUE; - - GList *child = m_list->children; - while (child) - { - GtkWidget *bin = GTK_WIDGET( child->data ); - if (bin->window == window) return TRUE; - child = child->next; - } - - return FALSE; + return gtk_tree_view_get_bin_window(m_treeview); } -void wxListBox::ApplyWidgetStyle() +void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) { - SetWidgetStyle(); - - if (m_backgroundColour.Ok()) + if (m_hasBgCol && m_backgroundColour.Ok()) { - GdkWindow *window = GTK_WIDGET(m_list)->window; - if ( window ) + GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview); + if (window) { - m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); + m_backgroundColour.CalcPixel( gdk_drawable_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; - } + gtk_widget_modify_style( GTK_WIDGET(m_treeview), style ); } -void wxListBox::OnInternalIdle() +wxSize wxListBox::DoGetBestSize() const { - wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; + wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view")); - if (GTK_WIDGET(m_list)->window && cursor.Ok()) - { - /* I now set the cursor the anew in every OnInternalIdle call - as setting the cursor in a parent window also effects the - windows above so that checking for the current cursor is - not possible. */ + // 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; - gdk_window_set_cursor( GTK_WIDGET(m_list)->window, cursor.GetCursor() ); + // 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) + { + int wLine; - GList *child = m_list->children; - while (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkWidget *label = GTK_WIDGET( bin->child ); + // Find the widest line + for(unsigned int i = 0; i < count; i++) { + wxString str(GetString(i)); + GetTextExtent(str, &wLine, NULL); + lbWidth = wxMax(lbWidth, wLine); + } - if (!label->window) - break; - else - gdk_window_set_cursor( label->window, cursor.GetCursor() ); + lbWidth += 3 * cx; - child = child->next; + // And just a bit more for the checkbox if present and then some + // (these are rough guesses) +#if wxUSE_CHECKLISTBOX + if ( m_hasCheckBoxes ) + { + 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); } - UpdateWindowUI(); + // Add room for the scrollbar + lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + + wxSize best(lbWidth, lbHeight); + CacheBestSize(best); + return best; } -wxSize wxListBox::DoGetBestSize() const +// static +wxVisualAttributes +wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return wxSize(100, 110); + return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new, true); } -#endif +#endif // wxUSE_LISTBOX