X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/034be8882cc091cf8ca1ccdf307190ac73adfe54..07014b5a0af156077f85ae45b6c5d5162d5cfb76:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 8c24f8b811..21fc6d64bf 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -1,77 +1,184 @@ ///////////////////////////////////////////////////////////////////////////// -// 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/dynarray.h" #include "wx/listbox.h" -#include "wx/utils.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/dynarray.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" +#endif + +#include "wx/arrstr.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 -#if wxUSE_DRAG_AND_DROP -#include "wx/dnd.h" -#endif +#include +#include +#include -#include "gdk/gdk.h" -#include "gtk/gtk.h" +//----------------------------------------------------------------------------- +// data +//----------------------------------------------------------------------------- + +extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnScroll; +extern wxCursor g_globalCursor; -//------------------------------------------------------------------------- -// 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) //----------------------------------------------------------------------------- -#define CHECKBOX_STRING "[-] " +#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST +# define WXLISTBOX_DATACOLUMN_ARG(x) (x->m_hasCheckBoxes ? 1 : 0) +#else +# define WXLISTBOX_DATACOLUMN_ARG(x) (0) +#endif // wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST -// checklistboxes have "[±] " prepended to their lables, this macro removes it -// (NB: 4 below is the length of CHECKBOX_STRING above) -// -// the argument to it is a "const char *" pointer -#define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label)) +#define WXLISTBOX_DATACOLUMN WXLISTBOX_DATACOLUMN_ARG(this) //----------------------------------------------------------------------------- -// data +// "row-activated" //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; -extern bool g_blockEventsOnScroll; +extern "C" { +static void +gtk_listbox_row_activated_callback(GtkTreeView *treeview, + GtkTreePath *path, + GtkTreeViewColumn *col, + wxListBox *listbox) +{ + if (g_isIdle) wxapp_install_idle_handler(); + + if (g_blockEventsOnDrag) return; + if (g_blockEventsOnScroll) return; + + if (!listbox->m_hasVMT) return; + + //Notes: + //1) This is triggered by either a double-click or a space press + //2) We handle both here because + //2a) in the case of a space/keypress we can't really know + // which item was pressed on because we can't get coords + // from a keyevent + //2b) It seems more correct + + int sel = gtk_tree_path_get_indices(path)[0]; + + if(!listbox->m_spacePressed) + { + //Assume it was double-click + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); + event.SetEventObject( listbox ); + + if(listbox->IsSelected(sel)) + { + GtkTreeEntry* entry = listbox->GtkGetEntry(sel); + + if(entry) + { + event.SetInt(sel); + event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry))); + + if ( listbox->HasClientObjectData() ) + event.SetClientObject( + (wxClientData*) gtk_tree_entry_get_userdata(entry) ); + else if ( listbox->HasClientUntypedData() ) + event.SetClientData( gtk_tree_entry_get_userdata(entry) ); + g_object_unref(G_OBJECT(entry)); + } + else + { + wxLogSysError(wxT("Internal error - could not get entry for double-click")); + event.SetInt(-1); + } + } + else + event.SetInt(-1); + + listbox->GetEventHandler()->ProcessEvent( event ); + } + else + { + listbox->m_spacePressed = false; //don't block selection behaviour anymore + + //Space was pressed - toggle the appropriate checkbox and the selection +#if wxUSE_CHECKLISTBOX //Do it for both native and non-native + if (listbox->m_hasCheckBoxes) + { + wxCheckListBox *clb = (wxCheckListBox *)listbox; + + clb->Check( sel, !clb->IsChecked(sel) ); + + wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); + new_event.SetEventObject( listbox ); + new_event.SetInt( sel ); + listbox->GetEventHandler()->ProcessEvent( new_event ); + } +#endif // wxUSE_CHECKLISTBOX + + if( (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) || + ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) ) + { + //toggle the selection + send event + listbox->GtkSetSelection(sel, !listbox->IsSelected( sel ), false); + } + } +} +} //----------------------------------------------------------------------------- // "button_press_event" //----------------------------------------------------------------------------- +extern "C" { static gint -gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) +gtk_listbox_button_press_callback( GtkWidget *widget, + GdkEventButton *gdk_event, + wxListBox *listbox ) { + if (g_isIdle) wxapp_install_idle_handler(); + if (g_blockEventsOnDrag) return FALSE; if (g_blockEventsOnScroll) return FALSE; - if (!listbox->HasVMT()) return FALSE; + if (!listbox->m_hasVMT) return FALSE; - int sel = listbox->GetIndex( widget ); + //Just to be on the safe side - it should be unset in the activate callback + //but we don't want any obscure bugs if it doesn't get called somehow... + listbox->m_spacePressed = false; +#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS)) { + GtkTreePath* path; + gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), + (gint)gdk_event->x, (gint)gdk_event->y, + &path, NULL, NULL, NULL); + int sel = gtk_tree_path_get_indices(path)[0]; + gtk_tree_path_free(path); + wxCheckListBox *clb = (wxCheckListBox *)listbox; clb->Check( sel, !clb->IsChecked(sel) ); @@ -81,115 +188,276 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, event.SetInt( sel ); listbox->GetEventHandler()->ProcessEvent( event ); } - - if (gdk_event->type == GDK_2BUTTON_PRESS) - { - wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); - event.SetEventObject( listbox ); - - wxArrayInt aSelections; - int count = listbox->GetSelections(aSelections); - if ( count > 0 ) - { - event.m_commandInt = aSelections[0] ; - event.m_clientData = listbox->GetClientData( event.m_commandInt ); - wxString str(listbox->GetString(event.m_commandInt)); - if (!str.IsEmpty()) event.m_commandString = str; - } - else - { - event.m_commandInt = -1 ; - event.m_commandString.Empty(); - } - - listbox->GetEventHandler()->ProcessEvent( event ); - - } +#endif // wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST 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 *widget, + GdkEventKey *gdk_event, + wxListBox *listbox ) { + if (g_isIdle) wxapp_install_idle_handler(); + if (g_blockEventsOnDrag) return FALSE; - if (!listbox->HasVMT()) return FALSE; - if (gdk_event->keyval != ' ') return FALSE; + bool ret = false; - int sel = listbox->GetIndex( widget ); + 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 ); + } - wxCheckListBox *clb = (wxCheckListBox *)listbox; + if ((gdk_event->keyval == GDK_Return) && (!ret)) + { + // eat return in all modes (RN:WHY?) + ret = true; + } - clb->Check( sel, !clb->IsChecked(sel) ); + // Check or uncheck item with SPACE + if (gdk_event->keyval == ' ') + { + //In the keyevent we don't know the index of the item + //and the activated event gets called anyway... + // + //Also, activating with the space causes the treeview to + //unselect all the items and then select the item in question + //wx's behaviour is to just toggle the item's selection state + //and leave the others alone + listbox->m_spacePressed = true; + } - wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); - event.SetEventObject( listbox ); - event.SetInt( sel ); - listbox->GetEventHandler()->ProcessEvent( event ); + if (ret) + { + g_signal_stop_emission_by_name (widget, "key_press_event"); + return TRUE; + } return FALSE; } +} //----------------------------------------------------------------------------- // "select" and "deselect" //----------------------------------------------------------------------------- -static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox ) +extern "C" { +static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection, + GtkTreeModel* model, + GtkTreePath* path, + gboolean is_selected, + wxListBox *listbox ) { - if (!listbox->HasVMT()) return; - if (g_blockEventsOnDrag) return; + if (g_isIdle) wxapp_install_idle_handler(); + + if (!listbox->m_hasVMT) return TRUE; + if (g_blockEventsOnDrag) return TRUE; + + if (listbox->m_spacePressed) return FALSE; //see keyevent callback + if (listbox->m_blockEvent) return TRUE; - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); + // NB: wxdocs explicitly say that this event only gets sent when + // something is actually selected, plus the controls example + // assumes so and passes -1 to the dogetclientdata funcs if not - wxArrayInt aSelections; - int count = listbox->GetSelections(aSelections); - if ( count > 0 ) + // OK, so basically we need to do a bit of a run-around here as + // 1) is_selected says whether the item(s?) are CURRENTLY selected - + // i.e. if is_selected is FALSE then the item is going to be + // selected right now! + // 2) However, since it is not already selected and the user + // will expect it to be we need to manually select it and + // return FALSE telling GTK we handled the selection + if (is_selected) return TRUE; + + int nIndex = gtk_tree_path_get_indices(path)[0]; + GtkTreeEntry* entry = listbox->GtkGetEntry(nIndex); + + if(entry) { - event.m_commandInt = aSelections[0] ; - event.m_clientData = listbox->GetClientData( event.m_commandInt ); - wxString str(listbox->GetString(event.m_commandInt)); - if (!str.IsEmpty()) event.m_commandString = str; + //Now, as mentioned above, we manually select the row that is/was going + //to be selected anyway by GTK + listbox->m_blockEvent = true; //if we don't block events we will lock the + //app due to recursion!! + + GtkTreeSelection* selection = + gtk_tree_view_get_selection(listbox->m_treeview); + GtkTreeIter iter; + gtk_tree_model_get_iter(GTK_TREE_MODEL(listbox->m_liststore), &iter, path); + gtk_tree_selection_select_iter(selection, &iter); + + listbox->m_blockEvent = false; + + //Finally, send the wx event + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); + event.SetEventObject( listbox ); + + // indicate whether this is a selection or a deselection + event.SetExtraLong( 1 ); + + event.SetInt(nIndex); + event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry))); + + if ( listbox->HasClientObjectData() ) + event.SetClientObject( + (wxClientData*) gtk_tree_entry_get_userdata(entry) + ); + else if ( listbox->HasClientUntypedData() ) + event.SetClientData( gtk_tree_entry_get_userdata(entry) ); + + listbox->GetEventHandler()->ProcessEvent( event ); + + g_object_unref(G_OBJECT(entry)); + return FALSE; //We handled it/did it manually } - else + + return TRUE; //allow selection to change +} +} + +//----------------------------------------------------------------------------- +// GtkTreeEntry destruction (to destroy client data) +//----------------------------------------------------------------------------- + +extern "C" { +static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry, + wxListBox* listbox) +{ + if(listbox->HasClientObjectData()) { - event.m_commandInt = -1 ; - event.m_commandString.Empty(); + gpointer userdata = gtk_tree_entry_get_userdata(entry); + if(userdata) + delete (wxClientData *)userdata; } +} +} + +//----------------------------------------------------------------------------- +// Sorting callback (standard CmpNoCase return value) +//----------------------------------------------------------------------------- + +extern "C" { +static gint gtk_listbox_sort_callback(GtkTreeModel *model, + GtkTreeIter *a, + GtkTreeIter *b, + wxListBox *listbox) +{ + GtkTreeEntry* entry; + GtkTreeEntry* entry2; + + 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")); + + //We compare collate keys here instead of calling g_utf8_collate + //as it is rather slow (and even the docs reccommend this) + int ret = strcasecmp(gtk_tree_entry_get_collate_key(entry), + gtk_tree_entry_get_collate_key(entry2)); + + g_object_unref(G_OBJECT(entry)); + g_object_unref(G_OBJECT(entry2)); + + return ret; +} +} + +//----------------------------------------------------------------------------- +// Searching callback (TRUE == not equal, FALSE == equal) +//----------------------------------------------------------------------------- + +extern "C" { +static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model, + gint column, + const gchar* key, + GtkTreeIter* iter, + wxListBox* listbox) +{ + GtkTreeEntry* entry; - event.SetEventObject( listbox ); + 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")); + gchar* keycollatekey = g_utf8_collate_key(key, -1); - listbox->GetEventHandler()->ProcessEvent( event ); + int ret = strcasecmp(keycollatekey, + gtk_tree_entry_get_collate_key(entry)); + + g_free(keycollatekey); + g_object_unref(G_OBJECT(entry)); + + return ret != 0; +} } //----------------------------------------------------------------------------- // wxListBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) -wxListBox::wxListBox() +// ---------------------------------------------------------------------------- +// construction +// ---------------------------------------------------------------------------- + +void wxListBox::Init() { - m_list = (GtkList *) NULL; - m_hasCheckBoxes = FALSE; + m_treeview = (GtkTreeView*) NULL; +#if wxUSE_CHECKLISTBOX + m_hasCheckBoxes = false; +#endif // wxUSE_CHECKLISTBOX + m_spacePressed = false; } bool wxListBox::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, - int n, const wxString choices[], - long style, const wxValidator& validator, const wxString &name ) + const wxArrayString& choices, + long style, const wxValidator& validator, + const wxString &name ) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; + wxCArrayString chs(choices); - PreCreation( parent, id, pos, size, style, name ); + return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name ); +} - SetValidator( validator ); +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_blockEvent = false; + + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxListBox creation failed") ); + return false; + } m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); if (style & wxLB_ALWAYS_SB) @@ -203,658 +471,684 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); } - m_list = GTK_LIST( gtk_list_new() ); - - GtkSelectionMode mode = GTK_SELECTION_BROWSE; - if (style & wxLB_MULTIPLE) - mode = GTK_SELECTION_MULTIPLE; - else if (style & wxLB_EXTENDED) - mode = GTK_SELECTION_EXTENDED; - gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); + GtkScrolledWindowSetBorder(m_widget, style); -#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 + m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) ); - gtk_widget_show( GTK_WIDGET(m_list) ); + //wxListBox doesn't have a header :) + //NB: If enabled SetFirstItem doesn't work correctly + gtk_tree_view_set_headers_visible(m_treeview, FALSE); - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 100; - if (newSize.y == -1) newSize.y = 110; - SetSize( newSize.x, newSize.y ); +#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST + if(m_hasCheckBoxes) + ((wxCheckListBox*)this)->DoCreateCheckList(); +#endif // wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST - for (int i = 0; i < n; i++) - { - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) NULL ); + // Create the data column + gtk_tree_view_insert_column_with_attributes(m_treeview, -1, "", + gtk_cell_renderer_text_new(), + "text", + WXLISTBOX_DATACOLUMN, NULL); - GtkWidget *list_item; + // Now create+set the model (GtkListStore) - first argument # of columns +#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST + 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); - wxString str(choices[i]); - if (m_hasCheckBoxes) - { - str.Prepend(CHECKBOX_STRING); - } + gtk_tree_view_set_model(m_treeview, GTK_TREE_MODEL(m_liststore)); - list_item = gtk_list_item_new_with_label( str ); + g_object_unref(G_OBJECT(m_liststore)); //free on treeview destruction - gtk_container_add( GTK_CONTAINER(m_list), list_item ); + // 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_signal_connect( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); + gtk_tree_view_set_enable_search(m_treeview, FALSE); - if (style & wxLB_MULTIPLE) - gtk_signal_connect( GTK_OBJECT(list_item), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - gtk_signal_connect( GTK_OBJECT(list_item), - "button_press_event", - (GtkSignalFunc)gtk_listbox_button_press_callback, - (gpointer) this ); + GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview ); + gtk_tree_selection_set_select_function(selection, + (GtkTreeSelectionFunc)gtk_listitem_select_cb, + this, NULL); //NULL == destroycb - if (m_hasCheckBoxes) - { - gtk_signal_connect( GTK_OBJECT(list_item), - "key_press_event", - (GtkSignalFunc)gtk_listbox_key_press_callback, - (gpointer)this ); - } + GtkSelectionMode mode; + if (style & wxLB_MULTIPLE) + { + mode = GTK_SELECTION_MULTIPLE; + } + else if (style & wxLB_EXTENDED) + { + mode = GTK_SELECTION_EXTENDED; + } + else + { + // if style was 0 set single mode + m_windowStyle |= wxLB_SINGLE; + mode = GTK_SELECTION_SINGLE; + } - ConnectWidget( list_item ); + gtk_tree_selection_set_mode( selection, mode ); - gtk_widget_show( list_item ); + //Handle sortable stuff + if(style & wxLB_SORT) + { + //Setup sorting in ascending (wx) order + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(m_liststore), + WXLISTBOX_DATACOLUMN, + GTK_SORT_ASCENDING); + + //Set the sort callback + gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(m_liststore), + WXLISTBOX_DATACOLUMN, + (GtkTreeIterCompareFunc) gtk_listbox_sort_callback, + this, //userdata + NULL //"destroy notifier" + ); } - m_parent->AddChild( this ); - (m_parent->m_insertCallback)( m_parent, this ); + gtk_container_add (GTK_CONTAINER (m_widget), GTK_WIDGET(m_treeview) ); + + gtk_widget_show( GTK_WIDGET(m_treeview) ); + + wxListBox::DoInsertItems(wxArrayString(n, choices), 0); // insert initial items - PostCreation(); + //treeview-specific events + g_signal_connect(m_treeview, "row-activated", + G_CALLBACK(gtk_listbox_row_activated_callback), this); - gtk_widget_realize( GTK_WIDGET(m_list) ); + // other events + g_signal_connect (m_treeview, "button_press_event", + G_CALLBACK (gtk_listbox_button_press_callback), + this); + g_signal_connect (m_treeview, "key_press_event", + G_CALLBACK (gtk_listbox_key_press_callback), + this); - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); + m_parent->DoAddChild( this ); - Show( TRUE ); + PostCreation(size); + SetBestSize(size); // need this too because this is a wxControlWithItems - return TRUE; + return true; } wxListBox::~wxListBox() { + m_hasVMT = false; + Clear(); } -void wxListBox::InsertItems(int nItems, const wxString items[], int pos) +// ---------------------------------------------------------------------------- +// adding items +// ---------------------------------------------------------------------------- + +void wxListBox::GtkInsertItems(const wxArrayString& items, + void** clientData, unsigned int pos) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - GList *children = m_list->children; - int length = g_list_length(children); - wxCHECK_RET( pos <= length, "invalid index in wxListBox::InsertItems" ); + InvalidateBestSize(); - // VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item - // into a listbox at the given position, this is why we first delete - // all items after this position, then append these items and then - // reappend back the old ones. + // Create and set column ids and GValues - // first detach the old items - int n; // loop var + unsigned int nNum = items.GetCount(); + unsigned int nCurCount = wxListBox::GetCount(); + wxASSERT_MSG(pos <= nCurCount, wxT("Invalid index passed to wxListBox")); - if ( pos == length ) + GtkTreeIter* pIter = NULL; // append by default + GtkTreeIter iter; + if (pos != nCurCount) { - // no need to do anything complicated - for ( n = 0; n < nItems; n++ ) + gboolean res = gtk_tree_model_iter_nth_child( + GTK_TREE_MODEL(m_liststore), + &iter, NULL, //NULL = parent = get first + (int)pos ); + if(!res) { - Append(items[n]); + wxLogSysError(wxT("internal wxListBox error in insertion")); + return; } - return; + pIter = &iter; } - - wxArrayString deletedLabels; - wxArrayPtrVoid deletedData; - wxArrayInt deletedChecks; // only for check list boxes - GList *child = g_list_nth( children, pos ); - for ( n = 0; child != NULL; n++, child = child->next ) + for (unsigned int i = 0; i < nNum; ++i) { - // save label - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str(GET_REAL_LABEL(label->label)); - deletedLabels.Add(str); + wxString label = items[i]; - // save data - void *clientData = NULL; - wxNode *node = NULL; - - if ( n < (int)m_clientObjectList.GetCount() ) - node = m_clientObjectList.Nth( n ); - - if ( node ) - { - clientData = node->GetData(); - m_clientObjectList.DeleteNode( node ); - } - - if ( !clientData ) - { - if ( n < (int)m_clientDataList.GetCount() ) - node = m_clientDataList.Nth( n ); - - if ( node ) - { - clientData = node->GetData(); - node = m_clientDataList.Nth( n ); - } - } - - deletedData.Add(clientData); - - // save check state - if ( m_hasCheckBoxes ) +#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST + if (m_hasCheckBoxes) { - deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n)); + label.Prepend(wxCHECKLBOX_STRING); } - } +#endif // wxUSE_CHECKLISTBOX - int nDeletedCount = n; - gtk_list_clear_items( m_list, pos, length ); + GtkTreeEntry* entry = gtk_tree_entry_new(); + gtk_tree_entry_set_label(entry, wxConvUTF8.cWX2MB(label)); + gtk_tree_entry_set_destroy_func(entry, + (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb, + this); - // now append the new items - for ( n = 0; n < nItems; n++ ) - { - Append(items[n]); - } + if (clientData) + gtk_tree_entry_set_userdata(entry, clientData[i]); - // and append the old items too - pos += nItems; // now the indices are shifter - for ( n = 0; n < nDeletedCount; n++ ) - { - Append(deletedLabels[n], deletedData[n]); + GtkTreeIter itercur; + gtk_list_store_insert_before(m_liststore, &itercur, pIter); - if ( m_hasCheckBoxes ) +#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST + if (m_hasCheckBoxes) { - ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]); + gtk_list_store_set(m_liststore, &itercur, + 0, FALSE, //FALSE == not toggled + 1, entry, -1); } + else +#endif + gtk_list_store_set(m_liststore, &itercur, + 0, entry, -1); + + g_object_unref(G_OBJECT(entry)); //liststore always refs :) } } -void wxListBox::AppendCommon( const wxString &item ) +void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( IsValidInsert(pos), wxT("invalid index in wxListBox::InsertItems") ); - GtkWidget *list_item; - - wxString label(item); - if (m_hasCheckBoxes) - { - label.Prepend(CHECKBOX_STRING); - } + GtkInsertItems(items, NULL, pos); +} - list_item = gtk_list_item_new_with_label( label ); +int wxListBox::DoAppend( const wxString& item ) +{ + // Call DoInsertItems + unsigned int nWhere = wxListBox::GetCount(); + wxArrayString aItems; + aItems.Add(item); + wxListBox::DoInsertItems(aItems, nWhere); + return nWhere; +} - gtk_container_add( GTK_CONTAINER(m_list), list_item ); +void wxListBox::DoSetItems( const wxArrayString& items, + void **clientData) +{ + Clear(); + GtkInsertItems(items, clientData, 0); +} - gtk_signal_connect( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); +// ---------------------------------------------------------------------------- +// deleting items +// ---------------------------------------------------------------------------- - if (GetWindowStyleFlag() & wxLB_MULTIPLE) - gtk_signal_connect( GTK_OBJECT(list_item), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); +void wxListBox::Clear() +{ + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - if (m_widgetStyle) ApplyWidgetStyle(); + InvalidateBestSize(); - gtk_signal_connect( GTK_OBJECT(list_item), - "button_press_event", - (GtkSignalFunc)gtk_listbox_button_press_callback, - (gpointer) this ); + gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */ +} - if (m_hasCheckBoxes) - { - gtk_signal_connect( GTK_OBJECT(list_item), - "key_press_event", - (GtkSignalFunc)gtk_listbox_key_press_callback, - (gpointer)this ); - } +void wxListBox::Delete(unsigned int n) +{ + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - gtk_widget_show( list_item ); + InvalidateBestSize(); - ConnectWidget( list_item ); + GtkTreeIter iter; + gboolean res = gtk_tree_model_iter_nth_child( + GTK_TREE_MODEL(m_liststore), + &iter, NULL, //NULL = parent = get first + n + ); -#if wxUSE_DRAG_AND_DROP -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) m_dropTarget->RegisterWidget( list_item ); -#endif -#endif + wxCHECK_RET( res, wxT("wrong listbox index") ); -#if wxUSE_TOOLTIPS - if (m_toolTip) m_toolTip->Apply( this ); -#endif + //this returns false if iter is invalid (i.e. deleting item + //at end) but since we don't use iter, well... :) + gtk_list_store_remove(m_liststore, &iter); } -void wxListBox::Append( const wxString &item ) -{ - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) NULL ); +// ---------------------------------------------------------------------------- +// get GtkTreeEntry from position (note: you need to g_unref it if valid) +// ---------------------------------------------------------------------------- - AppendCommon( item ); -} - -void wxListBox::Append( const wxString &item, void *clientData ) +struct _GtkTreeEntry* wxListBox::GtkGetEntry(int n) const { - m_clientDataList.Append( (wxObject*) clientData ); - m_clientObjectList.Append( (wxObject*) NULL ); + GtkTreeIter iter; + gboolean res = gtk_tree_model_iter_nth_child( + GTK_TREE_MODEL(m_liststore), + &iter, NULL, //NULL = parent = get first + n ); - AppendCommon( item ); -} + if (!res) + { + wxLogDebug(wxT("gtk_tree_model_iter_nth_child failed\n") + wxT("Passed in value was:[%i] List size:[%u]"), + n, wxListBox::GetCount() ); + return NULL; + } -void wxListBox::Append( const wxString &item, wxClientData *clientData ) -{ - m_clientObjectList.Append( (wxObject*) clientData ); - m_clientDataList.Append( (wxObject*) NULL ); - AppendCommon( item ); + GtkTreeEntry* entry = NULL; + gtk_tree_model_get(GTK_TREE_MODEL(m_liststore), &iter, + WXLISTBOX_DATACOLUMN, &entry, -1); + + return entry; } -void wxListBox::SetClientData( int n, void* clientData ) +// ---------------------------------------------------------------------------- +// client data +// ---------------------------------------------------------------------------- + +void* wxListBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); + wxCHECK_MSG( IsValid(n), NULL, + wxT("Invalid index passed to GetItemClientData") ); - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return; + 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(G_OBJECT(entry)); + return userdata; } -void* wxListBox::GetClientData( int n ) +wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const { - wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" ); - - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return NULL; - - return node->Data(); + return (wxClientData*) wxListBox::DoGetItemClientData(n); } -void wxListBox::SetClientObject( int n, wxClientData* clientData ) +void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - - wxNode *node = m_clientObjectList.Nth( n ); - if (!node) return; + wxCHECK_RET( IsValid(n), + wxT("Invalid index passed to SetItemClientData") ); - wxClientData *cd = (wxClientData*) node->Data(); - if (cd) delete cd; + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_RET(entry, wxT("could not get entry")); - node->SetData( (wxObject*) clientData ); + gtk_tree_entry_set_userdata( entry, clientData ); + g_object_unref(G_OBJECT(entry)); } -wxClientData* wxListBox::GetClientObject( int n ) +void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) { - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" ); - - wxNode *node = m_clientObjectList.Nth( n ); - if (!node) return (wxClientData*) NULL; - - return (wxClientData*) node->Data(); + // wxItemContainer already deletes data for us + wxListBox::DoSetItemClientData(n, (void*) clientData); } -void wxListBox::Clear() +// ---------------------------------------------------------------------------- +// string list access +// ---------------------------------------------------------------------------- + +void wxListBox::SetString(unsigned int n, const wxString &string) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") ); + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); - gtk_list_clear_items( m_list, 0, Number() ); + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_RET( entry, wxT("wrong listbox index") ); - wxNode *node = m_clientObjectList.First(); - while (node) - { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - node = node->Next(); - } - m_clientObjectList.Clear(); + wxString label = string; - m_clientDataList.Clear(); +#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST + if (m_hasCheckBoxes) + label.Prepend(wxCHECKLBOX_STRING); +#endif // wxUSE_CHECKLISTBOX + + // RN: This may look wierd but the problem is that the TreeView + // doesn't resort or update when changed above and there is no real + // notification function... + void* userdata = gtk_tree_entry_get_userdata(entry); + gtk_tree_entry_set_userdata(entry, NULL); //don't delete on destroy + g_object_unref(G_OBJECT(entry)); + + bool bWasSelected = wxListBox::IsSelected(n); + wxListBox::Delete(n); + + wxArrayString aItems; + aItems.Add(label); + GtkInsertItems(aItems, &userdata, n); + if (bWasSelected) + wxListBox::GtkSetSelection(n, true, true); } -void wxListBox::Delete( int n ) +wxString wxListBox::GetString(unsigned int n) const { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") ); - GList *child = g_list_nth( m_list->children, n ); + GtkTreeEntry* entry = GtkGetEntry(n); + wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") ); - wxCHECK_RET( child, "wrong listbox index" ); + wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ); - GList *list = g_list_append( (GList*) NULL, child->data ); - gtk_list_remove_items( m_list, list ); - g_list_free( list ); +#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST + // 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 ) + label.erase(0, 4); +#endif // wxUSE_CHECKLISTBOX - wxNode *node = m_clientObjectList.Nth( n ); - if (node) - { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - m_clientObjectList.DeleteNode( node ); - } - - node = m_clientDataList.Nth( n ); - if (node) - { - m_clientDataList.DeleteNode( node ); - } + g_object_unref(G_OBJECT(entry)); + return label; } -void wxListBox::Deselect( int n ) +unsigned int wxListBox::GetCount() const { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox") ); - gtk_list_unselect_item( m_list, n ); + return (unsigned int)gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_liststore), NULL); } -int wxListBox::FindString( const wxString &item ) const +int wxListBox::FindString( const wxString &item, bool bCase ) const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, 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 = GET_REAL_LABEL(label->label); - - if (str == item) - return count; + //Sort of hackish - maybe there is a faster way + unsigned int nCount = wxListBox::GetCount(); - count++; - child = child->next; + for(unsigned int i = 0; i < nCount; ++i) + { + if( item.IsSameAs( wxListBox::GetString(i), bCase ) ) + return (int)i; } - // it's not an error if the string is not found -> no wxCHECK - return -1; + // it's not an error if the string is not found -> no wxCHECK + return wxNOT_FOUND; } +// ---------------------------------------------------------------------------- +// selection +// ---------------------------------------------------------------------------- + int wxListBox::GetSelection() const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_treeview != NULL, -1, wxT("invalid listbox")); + wxCHECK_MSG( HasFlag(wxLB_SINGLE), -1, + 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); -int wxListBox::GetSelections( wxArrayInt& aSelections ) const -{ - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + // only works on single-sel + if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) + return -1; - // 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++; - } + GtkTreePath* path = + gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter); - aSelections.Empty(); + int sel = gtk_tree_path_get_indices(path)[0]; - 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_path_free(path); - return count; + return sel; } -wxString wxListBox::GetString( int n ) const +int wxListBox::GetSelections( wxArrayInt& aSelections ) const { - wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); + wxCHECK_MSG( m_treeview != NULL, -1, 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 ); + aSelections.Empty(); - wxString str = GET_REAL_LABEL(label->label); + int i = 0; + GtkTreeIter iter; + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); + + if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(m_liststore), &iter)) + { //gtk_tree_selection_get_selected_rows is GTK 2.2+ so iter instead + do + { + if (gtk_tree_selection_iter_is_selected(selection, &iter)) + aSelections.Add(i); - return str; + i++; + } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(m_liststore), &iter)); } - - wxFAIL_MSG("wrong listbox index"); - return ""; + return aSelections.GetCount(); } -wxString wxListBox::GetStringSelection() const +bool wxListBox::IsSelected( int n ) const { - wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); + wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid listbox") ); - GList *selection = m_list->selection; - if (selection) - { - GtkBin *bin = GTK_BIN( selection->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str = GET_REAL_LABEL(label->label); + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); - return str; - } - - wxFAIL_MSG("no listbox selection available"); - return ""; -} + GtkTreeIter iter; + gboolean res = gtk_tree_model_iter_nth_child( + GTK_TREE_MODEL(m_liststore), + &iter, NULL, //NULL = parent = get first + n ); -int wxListBox::Number() -{ - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( res, false, wxT("Invalid index") ); - GList *child = m_list->children; - int count = 0; - while (child) { count++; child = child->next; } - return count; + return gtk_tree_selection_iter_is_selected(selection, &iter); } -bool wxListBox::Selected( int n ) +void wxListBox::DoSetSelection( int n, bool select ) { - wxCHECK_MSG( m_list != NULL, FALSE, "invalid listbox" ); - - GList *target = g_list_nth( m_list->children, n ); - if (target) - { - GList *child = m_list->selection; - while (child) - { - if (child->data == target->data) return TRUE; - child = child->next; - } - } - wxFAIL_MSG("wrong listbox index"); - return FALSE; + return GtkSetSelection(n, select, true); //docs say no events here } -void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) ) +void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent) { - wxFAIL_MSG("wxListBox::Set not implemented"); -} + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); -void wxListBox::SetFirstItem( int WXUNUSED(n) ) -{ - wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); -} + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); -void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) ) -{ - wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); -} + GtkTreeIter iter; + gboolean res = gtk_tree_model_iter_nth_child( + GTK_TREE_MODEL(m_liststore), + &iter, NULL, //NULL = parent = get first + n + ); + wxCHECK_RET( res, wxT("Invalid index") ); -void wxListBox::SetSelection( int n, bool select ) -{ - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + m_blockEvent = blockEvent; if (select) - gtk_list_select_item( m_list, n ); + gtk_tree_selection_select_iter(selection, &iter); else - gtk_list_unselect_item( m_list, n ); + gtk_tree_selection_unselect_iter(selection, &iter); + + m_blockEvent = false; } -void wxListBox::SetString( int n, const wxString &string ) +void wxListBox::DoSetFirstItem( int n ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_treeview, wxT("invalid listbox") ); + wxCHECK_RET( IsValid(n), wxT("invalid index")); - GList *child = g_list_nth( m_list->children, n ); - if (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); + //RN: I have no idea why this line is needed... + if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_treeview)) + return; - wxString str; - if (m_hasCheckBoxes) - str += CHECKBOX_STRING; - str += string; + GtkTreeIter iter; + gtk_tree_model_iter_nth_child( + GTK_TREE_MODEL(m_liststore), + &iter, + NULL, //NULL = parent = get first + n + ); - gtk_label_set( label, str ); - } - else - { - wxFAIL_MSG("wrong listbox index"); - } -} + GtkTreePath* path = gtk_tree_model_get_path( + GTK_TREE_MODEL(m_liststore), &iter); -void wxListBox::SetStringSelection( const wxString &string, bool select ) -{ - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + // Scroll to the desired cell (0.0 == topleft alignment) + gtk_tree_view_scroll_to_cell(m_treeview, path, NULL, + TRUE, 0.0f, 0.0f); - SetSelection( FindString(string), select ); + gtk_tree_path_free(path); } -int wxListBox::GetIndex( GtkWidget *item ) const +// ---------------------------------------------------------------------------- +// hittest +// ---------------------------------------------------------------------------- + +int wxListBox::DoListHitTest(const wxPoint& point) const { - if (item) + // gtk_tree_view_get_path_at_pos() also gets items that are not visible and + // we only want visible items we need to check for it manually here + if ( !GetClientRect().Inside(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 char *tip ) +void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) { - GList *child = m_list->children; - while (child) - { - gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), tip, (gchar*) NULL ); - child = child->next; - } + // RN: Is this needed anymore? + gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), wxGTK_CONV(tip), (gchar*) NULL ); } #endif // wxUSE_TOOLTIPS -#if wxUSE_DRAG_AND_DROP -void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) +GtkWidget *wxListBox::GetConnectWidget() { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); - -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) - { - GList *child = m_list->children; - while (child) - { - m_dropTarget->UnregisterWidget( GTK_WIDGET( child->data ) ); - child = child->next; - } - } -#endif + // the correct widget for listbox events (such as mouse clicks for example) + // is m_treeview, not the parent scrolled window + return GTK_WIDGET(m_treeview); +} - wxWindow::SetDropTarget( dropTarget ); +bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) +{ + return (window == gtk_tree_view_get_bin_window(m_treeview)); +} -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) +void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) +{ + if (m_hasBgCol && m_backgroundColour.Ok()) { - GList *child = m_list->children; - while (child) + GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview); + if (window) { - m_dropTarget->RegisterWidget( GTK_WIDGET( child->data ) ); - child = child->next; + m_backgroundColour.CalcPixel( gdk_drawable_get_colormap( window ) ); + gdk_window_set_background( window, m_backgroundColour.GetColor() ); + gdk_window_clear( window ); } } -#endif -} -#endif -GtkWidget *wxListBox::GetConnectWidget() -{ - return GTK_WIDGET(m_list); + gtk_widget_modify_style( GTK_WIDGET(m_treeview), style ); } -bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) +void wxListBox::OnInternalIdle() { - if (wxWindow::IsOwnGtkWindow( window )) return TRUE; + //RN: Is this needed anymore? + wxCursor cursor = m_cursor; + if (g_globalCursor.Ok()) cursor = g_globalCursor; - GList *child = m_list->children; - while (child) + if (GTK_WIDGET(m_treeview)->window && cursor.Ok()) { - GtkWidget *bin = GTK_WIDGET( child->data ); - if (bin->window == window) return TRUE; - child = child->next; + /* 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. */ + GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview); + gdk_window_set_cursor( window, cursor.GetCursor() ); } - return FALSE; + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } -void wxListBox::ApplyWidgetStyle() +wxSize wxListBox::DoGetBestSize() const { - SetWidgetStyle(); - - if (m_backgroundColour.Ok()) + wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view")); + + // Start with a minimum size that's not too small + int cx, cy; + GetTextExtent( wxT("X"), &cx, &cy); + int lbWidth = 3 * cx; + int lbHeight = 10; + + // Get the visible area of the tree view (limit to the 10th item + // so that it isn't too big) + unsigned int count = GetCount(); + if (count) { - GdkWindow *window = GTK_WIDGET(m_list)->window; - m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); - gdk_window_set_background( window, m_backgroundColour.GetColor() ); - gdk_window_clear( window ); - } + int wLine; - GList *child = m_list->children; - while (child) - { - gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle ); + // Find the widest line + for(unsigned int i = 0; i < count; i++) { + wxString str(GetString(i)); + GetTextExtent(str, &wLine, NULL); + lbWidth = wxMax(lbWidth, wLine); + } - GtkBin *bin = GTK_BIN( child->data ); - GtkWidget *label = GTK_WIDGET( bin->child ); - gtk_widget_set_style( label, m_widgetStyle ); + 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 && wxUSE_NATIVEGTKCHECKLIST + 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); } + + // Add room for the scrollbar + lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + + wxSize best(lbWidth, lbHeight); + CacheBestSize(best); + return best; +} + +// static +wxVisualAttributes +wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new, true); } +#endif // wxUSE_LISTBOX