X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/687706f5e722ac8a39172024f794ae0ffbd190e2..fdb47e62b9f47f234bb0d34aa45dd1a44fdd1cbe:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 70203eb2db..97530d7a49 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -1,420 +1,351 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "listbox.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #if wxUSE_LISTBOX #include "wx/listbox.h" -#include "wx/dynarray.h" -#include "wx/arrstr.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/checklst.h" -#include "wx/settings.h" + +#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/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 -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnScroll; -extern wxCursor g_globalCursor; -extern wxWindowGTK *g_delayedFocus; -extern wxWindowGTK *g_focusWindow; -extern wxWindowGTK *g_focusWindowLast; -static bool g_hasDoubleClicked = FALSE; + //----------------------------------------------------------------------------- -// idle callback for SetFirstItem +// Macro to tell which row the strings are in (1 if native checklist, 0 if not) //----------------------------------------------------------------------------- -struct wxlistbox_idle_struct -{ - wxListBox *m_listbox; - int m_item; - gint m_tag; -}; - -extern "C" gint wxlistbox_idle_callback( gpointer gdata ) -{ - wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata; - gdk_threads_enter(); - - gtk_idle_remove( data->m_tag ); - - // check that the items haven't been deleted from the listbox since we had - // installed this callback - wxListBox *lbox = data->m_listbox; - if ( data->m_item < lbox->GetCount() ) - { - lbox->SetFirstItem( data->m_item ); - } - - delete data; - - gdk_threads_leave(); +#if wxUSE_CHECKLISTBOX +# define WXLISTBOX_DATACOLUMN_ARG(x) (x->m_hasCheckBoxes ? 1 : 0) +#else +# define WXLISTBOX_DATACOLUMN_ARG(x) (0) +#endif // wxUSE_CHECKLISTBOX - return TRUE; -} +#define WXLISTBOX_DATACOLUMN WXLISTBOX_DATACOLUMN_ARG(this) //----------------------------------------------------------------------------- -// "focus_in_event" +// "row-activated" //----------------------------------------------------------------------------- -static gint gtk_listitem_focus_in_callback( GtkWidget *widget, - GdkEvent *WXUNUSED(event), - wxWindow *win ) +extern "C" { +static void +gtk_listbox_row_activated_callback(GtkTreeView * WXUNUSED(treeview), + GtkTreePath *path, + GtkTreeViewColumn * WXUNUSED(col), + wxListBox *listbox) { - if (g_isIdle) - wxapp_install_idle_handler(); - - g_focusWindowLast = - g_focusWindow = win; - - // does the window itself think that it has the focus? - if ( !win->m_hasFocus ) - { - // not yet, notify it - win->m_hasFocus = TRUE; - - wxChildFocusEvent eventChildFocus(win); - (void)win->GetEventHandler()->ProcessEvent(eventChildFocus); + if (g_blockEventsOnDrag) return; + if (g_blockEventsOnScroll) return; - wxFocusEvent eventFocus(wxEVT_SET_FOCUS, win->GetId()); - eventFocus.SetEventObject(win); + // This is triggered by either a double-click or a space press - (void)win->GetEventHandler()->ProcessEvent(eventFocus); - } + int sel = gtk_tree_path_get_indices(path)[0]; - return FALSE; -} + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); + event.SetEventObject( listbox ); -//----------------------------------------------------------------------------- -// "focus_out_event" -//----------------------------------------------------------------------------- + if (listbox->IsSelected(sel)) + { + GtkTreeEntry* entry = listbox->GtkGetEntry(sel); -static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win ) -{ - if (g_isIdle) - wxapp_install_idle_handler(); + if (entry) + { + event.SetInt(sel); + event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry))); - g_focusWindow = (wxWindowGTK *)NULL; + if ( listbox->HasClientObjectData() ) + event.SetClientObject( (wxClientData*) gtk_tree_entry_get_userdata(entry) ); + else if ( listbox->HasClientUntypedData() ) + event.SetClientData( gtk_tree_entry_get_userdata(entry) ); - // don't send the window a kill focus event if it thinks that it doesn't - // have focus already - if ( win->m_hasFocus ) + g_object_unref (entry); + } + else + { + wxLogSysError(wxT("Internal error - could not get entry for double-click")); + event.SetInt(-1); + } + } + else { - win->m_hasFocus = FALSE; - - wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); - event.SetEventObject( win ); - - // even if we did process the event in wx code, still let GTK itself - // process it too as otherwise bad things happen, especially in GTK2 - // where the text control simply aborts the program if it doesn't get - // the matching focus out event - (void)win->GetEventHandler()->ProcessEvent( event ); + event.SetInt(-1); } - return FALSE; + listbox->HandleWindowEvent( event ); +} } //----------------------------------------------------------------------------- -// "button_release_event" +// "changed" //----------------------------------------------------------------------------- -/* 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 * WXUNUSED(widget), - GdkEventButton * WXUNUSED(gdk_event), - wxListBox *listbox ) +extern "C" { +static void +gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection), + wxListBox *listbox ) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (g_blockEventsOnDrag) return FALSE; - if (g_blockEventsOnScroll) return FALSE; - - if (!listbox->m_hasVMT) return FALSE; + if (g_blockEventsOnDrag) return; - if (!g_hasDoubleClicked) return FALSE; + if (listbox->m_blockEvent) return; - wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); event.SetEventObject( listbox ); - wxArrayInt aSelections; - int n, count = listbox->GetSelections(aSelections); - if ( count > 0 ) + if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED)) { - 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; - } + wxArrayInt selections; + listbox->GetSelections( selections ); - event.SetInt(n); + if (selections.GetCount() == 0) + { + // indicate that this is a deselection + event.SetExtraLong( 0 ); + event.SetInt( -1 ); - listbox->GetEventHandler()->ProcessEvent( event ); + listbox->HandleWindowEvent( event ); - return FALSE; -} + return; + } + else + { + // indicate that this is a selection + event.SetExtraLong( 1 ); + event.SetInt( selections[0] ); -//----------------------------------------------------------------------------- -// "button_press_event" -//----------------------------------------------------------------------------- + listbox->HandleWindowEvent( event ); + } + } + else + { + int index = listbox->GetSelection(); + if (index == wxNOT_FOUND) + { + // indicate that this is a deselection + event.SetExtraLong( 0 ); + event.SetInt( -1 ); -static gint -gtk_listbox_button_press_callback( GtkWidget *widget, - GdkEventButton *gdk_event, - wxListBox *listbox ) -{ - if (g_isIdle) wxapp_install_idle_handler(); + listbox->HandleWindowEvent( event ); - if (g_blockEventsOnDrag) return FALSE; - if (g_blockEventsOnScroll) return FALSE; + return; + } + else + { + GtkTreeEntry* entry = listbox->GtkGetEntry( index ); - if (!listbox->m_hasVMT) return FALSE; + // indicate that this is a selection + event.SetExtraLong( 1 ); - int sel = listbox->GtkGetIndex( widget ); + event.SetInt( index ); + event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry))); -#if wxUSE_CHECKLISTBOX - if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS)) - { - wxCheckListBox *clb = (wxCheckListBox *)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) ); - clb->Check( sel, !clb->IsChecked(sel) ); + listbox->HandleWindowEvent( event ); - wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); - event.SetEventObject( listbox ); - event.SetInt( sel ); - listbox->GetEventHandler()->ProcessEvent( event ); + g_object_unref (entry); + } } -#endif // wxUSE_CHECKLISTBOX - - /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */ - g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS); - - return FALSE; +} } //----------------------------------------------------------------------------- // "key_press_event" //----------------------------------------------------------------------------- +extern "C" { static gint -gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox ) +gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget), + GdkEventKey *gdk_event, + wxListBox *listbox ) { - if (g_isIdle) - wxapp_install_idle_handler(); - - if (g_blockEventsOnDrag) - return FALSE; - - bool ret = FALSE; - - 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 ); - } - - if ((gdk_event->keyval == GDK_Return) && (!ret)) + if ((gdk_event->keyval == GDK_Return) || + (gdk_event->keyval == GDK_ISO_Enter) || + (gdk_event->keyval == GDK_KP_Enter)) { - // eat return in all modes - ret = TRUE; - } + int index = listbox->GetSelection(); + if (index != wxNOT_FOUND) + { + + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); + event.SetEventObject( listbox ); + + GtkTreeEntry* entry = listbox->GtkGetEntry( index ); -#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 + /* bool ret = */ listbox->HandleWindowEvent( event ); - // Check or uncheck item with SPACE - if ((gdk_event->keyval == ' ') && (!ret) && - (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) || - ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) ) - { - int sel = listbox->GtkGetIndex( widget ); - - if (sel != -1) - { - ret = TRUE; - - if (listbox->IsSelected( sel )) - gtk_list_unselect_item( listbox->m_list, sel ); - else - gtk_list_select_item( listbox->m_list, sel ); + g_object_unref (entry); - wxCommandEvent new_event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); - new_event.SetEventObject( listbox ); - wxArrayInt aSelections; - int n, count = listbox->GetSelections(aSelections); - if ( count > 0 ) +// wxMac and wxMSW always invoke default action +// if (!ret) { - n = aSelections[0]; - if ( listbox->HasClientObjectData() ) - new_event.SetClientObject( listbox->GetClientObject(n) ); - else if ( listbox->HasClientUntypedData() ) - new_event.SetClientData( listbox->GetClientData(n) ); - new_event.SetString( listbox->GetString(n) ); + // DClick not handled -> invoke default action + wxWindow *tlw = wxGetTopLevelParent( listbox ); + if (tlw) + { + GtkWindow *gtk_window = GTK_WINDOW( tlw->GetHandle() ); + if (gtk_window) + gtk_window_activate_default( gtk_window ); + } } - else - { - n = -1; - } - new_event.SetInt(n); - listbox->GetEventHandler()->ProcessEvent( new_event ); + + // Always intercept, otherwise we'd get another dclick + // event from row_activated + return TRUE; } } - if (ret) - { - gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); - return TRUE; - } - 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) +//----------------------------------------------------------------------------- + +extern "C" { +static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(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")); - if (listbox->m_blockEvent) return; + //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)); - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); - event.SetEventObject( listbox ); + g_object_unref (entry); + g_object_unref (entry2); - // indicate whether this is a selection or a deselection - event.SetExtraLong( is_selection ); + return ret; +} +} - if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0) - { - int sel = listbox->GtkGetIndex( widget ); +//----------------------------------------------------------------------------- +// Searching callback (TRUE == not equal, FALSE == equal) +//----------------------------------------------------------------------------- - if (listbox->m_prevSelection != sel) - gtk_list_unselect_item( listbox->m_list, listbox->m_prevSelection ); +extern "C" { +static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model), + gint WXUNUSED(column), + const gchar* key, + GtkTreeIter* iter, + wxListBox* listbox) +{ + GtkTreeEntry* entry; - listbox->m_prevSelection = sel; - } + 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)); - 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; - } + int ret = strcmp(keycollatekey, + gtk_tree_entry_get_collate_key(entry)); - event.SetInt(n); + g_object_unref (entry); -// No longer required with new code in wxLB_SINGLE -// listbox->GetEventHandler()->AddPendingEvent( event ); - listbox->GetEventHandler()->ProcessEvent( event ); + 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 } @@ -436,16 +367,13 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; - m_prevSelection = 0; // or -1 ?? - m_blockEvent = FALSE; + 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 ); @@ -460,7 +388,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) @@ -475,455 +454,284 @@ 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 ); - gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), GTK_WIDGET(m_list) ); + // Handle sortable stuff + if(HasFlag(wxLB_SORT)) + { + // Setup sorting in ascending (wx) order + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(m_liststore), + WXLISTBOX_DATACOLUMN, + GTK_SORT_ASCENDING); - /* 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))); + // 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" + ); + } - gtk_widget_show( GTK_WIDGET(m_list) ); - 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); + + Append(n, choices); // insert initial items + + // generate dclick events + g_signal_connect_after(m_treeview, "row-activated", + G_CALLBACK(gtk_listbox_row_activated_callback), this); + // for intercepting dclick generation by + g_signal_connect (m_treeview, "key_press_event", + G_CALLBACK (gtk_listbox_key_press_callback), + this); m_parent->DoAddChild( this ); PostCreation(size); - SetBestSize(size); // need this too because this is a wxControlWithItems + 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; } // ---------------------------------------------------------------------------- // adding items // ---------------------------------------------------------------------------- -void wxListBox::DoInsertItems(const wxArrayString& items, int pos) +int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, + wxClientDataType type) { - wxCHECK_RET( m_list != NULL, 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 - - // 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") ); + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); InvalidateBestSize(); - GList *children = m_list->children; - int length = g_list_length(children); - - wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") ); - - size_t nItems = items.GetCount(); - int index; - - if (m_strings) + GtkTreeIter* pIter = NULL; // append by default + GtkTreeIter iter; + if ( pos != GetCount() ) { - for (size_t n = 0; n < nItems; n++) - { - index = m_strings->Add( items[n] ); - - if (index != GetCount()) - { - GtkAddItem( items[n], index ); - wxList::compatibility_iterator node = m_clientList.Item( 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] ); + wxCHECK_MSG( GtkGetIteratorFor(pos, &iter), wxNOT_FOUND, + wxT("internal wxListBox error in insertion") ); - m_clientList.Append((wxObject *)NULL); - } - } - else - { - wxList::compatibility_iterator node = m_clientList.Item( pos ); - for ( size_t n = 0; n < nItems; n++ ) - { - GtkAddItem( items[n], pos+n ); - - m_clientList.Insert( node, (wxObject *)NULL ); - } - } + pIter = &iter; } - wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(), - wxT("bug in client data management") ); -} - -int wxListBox::DoAppend( const wxString& item ) -{ - InvalidateBestSize(); - - if (m_strings) + const unsigned int numItems = items.GetCount(); + for ( unsigned int i = 0; i < numItems; ++i ) { - // need to determine the index - int index = m_strings->Add( item ); + 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); - // only if not at the end anyway - if (index != GetCount()) - { - GtkAddItem( item, index ); + GtkTreeIter itercur; + gtk_list_store_insert_before(m_liststore, &itercur, pIter); - wxList::compatibility_iterator node = m_clientList.Item( index ); - m_clientList.Insert( node, (wxObject *)NULL ); + GtkSetItem(itercur, entry); - return index; - } - } + g_object_unref (entry); - GtkAddItem(item); - - m_clientList.Append((wxObject *)NULL); - - return GetCount() - 1; -} - -void wxListBox::GtkAddItem( const wxString &item, int pos ) -{ - wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); - - GtkWidget *list_item; - - wxString label(item); -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - { - label.Prepend(wxCHECKLBOX_STRING); + if (clientData) + AssignNewItemClientData(GtkGetIndexFor(itercur), clientData, i, type); } -#endif // wxUSE_CHECKLISTBOX - - list_item = gtk_list_item_new_with_label( wxGTK_CONV( label ) ); - - 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 ); - - gtk_signal_connect_after( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - - if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED)) - gtk_signal_connect_after( GTK_OBJECT(list_item), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(list_item), - "button_press_event", - (GtkSignalFunc)gtk_listbox_button_press_callback, - (gpointer) this ); - - gtk_signal_connect_after( GTK_OBJECT(list_item), - "button_release_event", - (GtkSignalFunc)gtk_listbox_button_release_callback, - (gpointer) this ); - - gtk_signal_connect( GTK_OBJECT(list_item), - "key_press_event", - (GtkSignalFunc)gtk_listbox_key_press_callback, - (gpointer)this ); - - - gtk_signal_connect( GTK_OBJECT(list_item), "focus_in_event", - GTK_SIGNAL_FUNC(gtk_listitem_focus_in_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(list_item), "focus_out_event", - GTK_SIGNAL_FUNC(gtk_listitem_focus_out_callback), (gpointer)this ); - - - ConnectWidget( list_item ); + return pos + numItems - 1; +} - gtk_widget_show( list_item ); +// ---------------------------------------------------------------------------- +// deleting items +// ---------------------------------------------------------------------------- - if (GTK_WIDGET_REALIZED(m_widget)) - { - gtk_widget_realize( list_item ); - gtk_widget_realize( GTK_BIN(list_item)->child ); +void wxListBox::DoClear() +{ + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); -#if wxUSE_TOOLTIPS - if (m_tooltip) m_tooltip->Apply( this ); -#endif - } + InvalidateBestSize(); - // Apply current widget style to the new list_item - GtkRcStyle *style = CreateWidgetStyle(); - if (style) - { - gtk_widget_modify_style( GTK_WIDGET( list_item ), style ); - GtkBin *bin = GTK_BIN( list_item ); - GtkWidget *label = GTK_WIDGET( bin->child ); - gtk_widget_modify_style( label, style ); - gtk_rc_style_unref( style ); - } + gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */ } -void wxListBox::DoSetItems( const wxArrayString& items, - void **clientData) +void wxListBox::DoDeleteOneItem(unsigned int n) { - Clear(); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - DoInsertItems(items, 0); + InvalidateBestSize(); - if ( clientData ) - { - size_t count = items.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - SetClientData(n, clientData[n]); - } - } + GtkTreeIter iter; + wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("wrong listbox index") ); + + // this returns false if iter is invalid (e.g. deleting item at end) but + // since we don't use iter, we ignore the return value + gtk_list_store_remove(m_liststore, &iter); } // ---------------------------------------------------------------------------- -// deleting items +// helper functions for working with iterators // ---------------------------------------------------------------------------- -void wxListBox::Clear() +bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const { - wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); - - gtk_list_clear_items( m_list, 0, GetCount() ); - - if ( GTK_LIST(m_list)->last_focus_child != NULL ) + if ( !gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_liststore), + iter, NULL, pos) ) { - // This should be NULL, I think. - GTK_LIST(m_list)->last_focus_child = NULL; + wxLogDebug(wxT("gtk_tree_model_iter_nth_child(%u) failed"), pos); + return false; } - 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! - wxList::compatibility_iterator node = m_clientList.GetFirst(); - while ( node ) - { - delete (wxClientData *)node->GetData(); - node = node->GetNext(); - } - } - m_clientList.Clear(); - - if ( m_strings ) - m_strings->Clear(); + return true; } -void wxListBox::Delete( int n ) +int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const { - wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + GtkTreePath *path = + gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter); - GList *child = g_list_nth( m_list->children, n ); + gint* pIntPath = gtk_tree_path_get_indices(path); - wxCHECK_RET( child, wxT("wrong listbox index") ); + wxCHECK_MSG( pIntPath, wxNOT_FOUND, _T("failed to get iterator path") ); - GList *list = g_list_append( (GList*) NULL, child->data ); - gtk_list_remove_items( m_list, list ); - g_list_free( list ); + int idx = pIntPath[0]; - wxList::compatibility_iterator node = m_clientList.Item( n ); - if ( node ) - { - if ( m_clientDataItemsType == wxClientData_Object ) - { - wxClientData *cd = (wxClientData*)node->GetData(); - delete cd; - } - - m_clientList.Erase( node ); - } + gtk_tree_path_free( path ); - if ( m_strings ) - m_strings->RemoveAt(n); + return idx; } -// ---------------------------------------------------------------------------- -// client data -// ---------------------------------------------------------------------------- - -void wxListBox::DoSetItemClientData( int n, void* 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, wxT("invalid listbox control") ); + GtkTreeIter iter; + if ( !GtkGetIteratorFor(n, &iter) ) + return NULL; + - wxList::compatibility_iterator node = m_clientList.Item( n ); - wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") ); + GtkTreeEntry* entry = NULL; + gtk_tree_model_get(GTK_TREE_MODEL(m_liststore), &iter, + WXLISTBOX_DATACOLUMN, &entry, -1); - node->SetData( (wxObject*) clientData ); + return entry; } -void* wxListBox::DoGetItemClientData( int n ) const +void wxListBox::GtkSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry) { - wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") ); - - wxList::compatibility_iterator node = m_clientList.Item( n ); - wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") ); - - return node->GetData(); +#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); + } } -void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); +// ---------------------------------------------------------------------------- +// client data +// ---------------------------------------------------------------------------- - wxList::compatibility_iterator node = m_clientList.Item( n ); - wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") ); +void* wxListBox::DoGetItemClientData(unsigned int n) const +{ + wxCHECK_MSG( IsValid(n), NULL, + wxT("Invalid index passed to GetItemClientData") ); - // wxItemContainer already deletes data for us + 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; } -wxClientData* wxListBox::DoGetItemClientObject( int n ) const +void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) { - wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") ); + wxCHECK_RET( IsValid(n), + wxT("Invalid index passed to SetItemClientData") ); - wxList::compatibility_iterator node = m_clientList.Item( n ); - wxCHECK_MSG( node, (wxClientData *)NULL, - wxT("invalid index in wxListBox::DoGetItemClientObject") ); + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_RET(entry, wxT("could not get entry")); - return (wxClientData*) node->GetData(); + gtk_tree_entry_set_userdata( entry, clientData ); + g_object_unref (entry); } // ---------------------------------------------------------------------------- // string list access // ---------------------------------------------------------------------------- -wxString wxListBox::GetRealLabel(GList *item) const +void wxListBox::SetString(unsigned int n, const wxString& label) { - GtkBin *bin = GTK_BIN( item->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str; - -#ifdef __WXGTK20__ - str = wxGTK_CONV_BACK( gtk_label_get_text( label ) ); -#else - str = wxString( label->label ); -#endif - -#if wxUSE_CHECKLISTBOX - // checklistboxes have "[±] " prepended to their lables, remove it - // - // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk/checklst.h - if ( m_hasCheckBoxes ) - str.erase(0, 4); -#endif // wxUSE_CHECKLISTBOX + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - return str; -} + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_RET( entry, wxT("wrong listbox index") ); -void wxListBox::SetString( int n, const wxString &string ) -{ - wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + // update the item itself + gtk_tree_entry_set_label(entry, wxGTK_CONV(label)); - GList *child = g_list_nth( m_list->children, n ); - if (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); + // and update the model which will refresh the tree too + GtkTreeIter iter; + wxCHECK_RET( GtkGetIteratorFor(n, &iter), _T("failed to get iterator") ); - wxString str; -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - str += wxCHECKLBOX_STRING; -#endif // wxUSE_CHECKLISTBOX - str += string; + // FIXME: this resets the checked status of a wxCheckListBox item - gtk_label_set( label, wxGTK_CONV( str ) ); - } - else - { - wxFAIL_MSG(wxT("wrong listbox index")); - } + GtkSetItem(iter, entry); } -wxString wxListBox::GetString( int n ) const +wxString wxListBox::GetString(unsigned int n) const { - wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") ); - GList *child = g_list_nth( m_list->children, n ); - if (child) - { - return GetRealLabel(child); - } + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") ); - wxFAIL_MSG(wxT("wrong listbox index")); + wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ); - return wxT(""); + g_object_unref (entry); + return label; } -int wxListBox::GetCount() const +unsigned int wxListBox::GetCount() const { - wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox") ); - GList *children = m_list->children; - return g_list_length(children); + return (unsigned int)gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_liststore), NULL); } -int wxListBox::FindString( const wxString &item ) const +int wxListBox::FindString( const wxString &item, bool bCase ) const { - wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); - GList *child = m_list->children; - int count = 0; - while (child) - { - if ( GetRealLabel(child) == 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 + // it's not an error if the string is not found -> no wxCHECK return wxNOT_FOUND; } @@ -933,288 +741,275 @@ int wxListBox::FindString( const wxString &item ) const int wxListBox::GetSelection() const { - wxCHECK_MSG( m_list != NULL, -1, 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 = 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, 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++; - } + 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(); } bool wxListBox::IsSelected( int n ) const { - wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid listbox") ); + + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); + + GtkTreeIter iter; + wxCHECK_MSG( GtkGetIteratorFor(n, &iter), false, wxT("Invalid index") ); + + return gtk_tree_selection_iter_is_selected(selection, &iter); +} - GList *target = g_list_nth( m_list->children, n ); +void wxListBox::DoSetSelection( int n, bool select ) +{ + // passing -1 to SetSelection() is documented to deselect all items + if ( n == wxNOT_FOUND ) + { + // ... and not generate any events in the process + GtkDeselectAll(); + return; + } - wxCHECK_MSG( target, FALSE, wxT("invalid listbox index") ); + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") ); - return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ; + // don't generate the selection event + GtkSetSelection(n, select, true); } -void wxListBox::SetSelection( int n, bool select ) +void wxListBox::GtkDeselectAll() { - wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); + + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); + + m_blockEvent = true; - m_blockEvent = TRUE; + gtk_tree_selection_unselect_all(selection); + + m_blockEvent = false; +} + +void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent) +{ + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); + + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); + + GtkTreeIter iter; + wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("Invalid index") ); + + 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); + + GtkTreePath* path = gtk_tree_model_get_path( + GTK_TREE_MODEL(m_liststore), &iter); + + gtk_tree_view_scroll_to_cell(m_treeview, path, NULL, FALSE, 0.0f, 0.0f); + + gtk_tree_path_free(path); - m_blockEvent = FALSE; + m_blockEvent = false; } -void wxListBox::DoSetFirstItem( int n ) +void wxListBox::DoScrollToCell(int n, float alignY, float alignX) { - 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") ); + GtkTreeIter iter; + if ( !GtkGetIteratorFor(n, &iter) ) + return; - GList *target = g_list_nth( m_list->children, n ); - wxCHECK_RET( target, wxT("invalid listbox index") ); + GtkTreePath* path = gtk_tree_model_get_path( + GTK_TREE_MODEL(m_liststore), &iter); - GtkWidget *item = GTK_WIDGET(target->data); - wxCHECK_RET( item, wxT("invalid listbox code") ); + // Scroll to the desired cell (0.0 == topleft alignment) + gtk_tree_view_scroll_to_cell(m_treeview, path, NULL, + TRUE, alignY, alignX); - 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 ); + gtk_tree_path_free(path); +} - return; - } +void wxListBox::DoSetFirstItem(int n) +{ + DoScrollToCell(n, 0, 0); +} - float y = item->allocation.y; - if (y > adjustment->upper - adjustment->page_size) - y = adjustment->upper - adjustment->page_size; - gtk_adjustment_set_value( adjustment, y ); +void wxListBox::EnsureVisible(int n) +{ + DoScrollToCell(n, 0.5, 0); } // ---------------------------------------------------------------------------- -// helpers +// hittest // ---------------------------------------------------------------------------- -int wxListBox::GtkGetIndex( GtkWidget *item ) const +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 ), wxConvCurrent->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 GtkWidget *wxListBox::GetConnectWidget() { - // return GTK_WIDGET(m_list); - return m_widget; + // 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 { - return TRUE; - -#if 0 - if (m_widget->window == window) return TRUE; - - 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; -#endif + return gtk_tree_view_get_bin_window(m_treeview); } void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) { 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_modify_style( GTK_WIDGET(child->data), style ); - - GtkBin *bin = GTK_BIN( child->data ); - GtkWidget *label = GTK_WIDGET( bin->child ); - gtk_widget_modify_style( label, style ); - - 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; - - 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. */ + wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view")); - gdk_window_set_cursor( GTK_WIDGET(m_list)->window, cursor.GetCursor() ); - - GList *child = m_list->children; - while (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkWidget *label = GTK_WIDGET( bin->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; - if (!label->window) - break; - else - gdk_window_set_cursor( label->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; - child = child->next; + // 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 (g_delayedFocus == this) - { - if (GTK_WIDGET_REALIZED(m_widget)) + lbWidth += 3 * cx; + + // And just a bit more for the checkbox if present and then some + // (these are rough guesses) +#if wxUSE_CHECKLISTBOX + if ( m_hasCheckBoxes ) { - gtk_widget_grab_focus( m_widget ); - g_delayedFocus = NULL; + lbWidth += 35; + cy = cy > 25 ? cy : 25; // rough height of checkbox } - } - - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); -} +#endif -wxSize wxListBox::DoGetBestSize() const -{ - int lbWidth = 100; // some defaults - int lbHeight = 110; - int wLine; - - // Find the widest line - for(int i = 0; i < GetCount(); i++) { - wxString str(GetString(i)); - GetTextExtent(str, &wLine, NULL); - lbWidth = wxMax(lbWidth, wLine); + // 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); } // Add room for the scrollbar lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); - // And just a bit more - int cx, cy; - GetTextExtent( wxT("X"), &cx, &cy); - lbWidth += 3 * cx; - - // 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(GetCount(), 3), 10); - wxSize best(lbWidth, lbHeight); - CacheBestSize(best); + CacheBestSize(best); return best; } -void wxListBox::FixUpMouseEvent(GtkWidget *widget, wxCoord& x, wxCoord& y) -{ - // the mouse event coords are relative to the listbox items, we need to - // translate them to the normal client coords - x += widget->allocation.x; - y += widget->allocation.y; -} - - // static wxVisualAttributes wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return GetDefaultAttributesFromGTKWidget(gtk_list_new, true); + return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new, true); } #endif // wxUSE_LISTBOX -