X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5e41cfecb9880ddef1ffd11a527f176cd7b87de..977d15a6ae64752c3ae70824c115229ecbe98403:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 754e6dad26..ad3193f273 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -11,23 +11,25 @@ // 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" -#include "wx/log.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 @@ -40,15 +42,8 @@ extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnScroll; -extern wxCursor g_globalCursor; -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; //----------------------------------------------------------------------------- // Macro to tell which row the strings are in (1 if native checklist, 0 if not) @@ -106,11 +101,11 @@ gtk_listbox_row_activated_callback(GtkTreeView *treeview, event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry))); if ( listbox->HasClientObjectData() ) - event.SetClientObject( + 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)); + g_object_unref (entry); } else { @@ -146,7 +141,7 @@ gtk_listbox_row_activated_callback(GtkTreeView *treeview, ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) ) { //toggle the selection + send event - listbox->GtkSetSelection(sel, !listbox->IsSelected( sel ), FALSE); + listbox->GtkSetSelection(sel, !listbox->IsSelected( sel ), false); } } } @@ -162,7 +157,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) { - if (g_isIdle) wxapp_install_idle_handler(); + // don't need to install idle handler, its done from "event" signal if (g_blockEventsOnDrag) return FALSE; if (g_blockEventsOnScroll) return FALSE; @@ -177,7 +172,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget, 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), + 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]; @@ -204,16 +199,16 @@ gtk_listbox_button_press_callback( GtkWidget *widget, extern "C" { static gint -gtk_listbox_key_press_callback( GtkWidget *widget, - GdkEventKey *gdk_event, +gtk_listbox_key_press_callback( GtkWidget *widget, + GdkEventKey *gdk_event, wxListBox *listbox ) { - if (g_isIdle) wxapp_install_idle_handler(); + // don't need to install idle handler, its done from "event" signal if (g_blockEventsOnDrag) return FALSE; - bool ret = FALSE; + bool ret = false; if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) { @@ -229,7 +224,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, if ((gdk_event->keyval == GDK_Return) && (!ret)) { // eat return in all modes (RN:WHY?) - ret = TRUE; + ret = true; } // Check or uncheck item with SPACE @@ -238,20 +233,14 @@ gtk_listbox_key_press_callback( GtkWidget *widget, //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 + //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; } - if (ret) - { - g_signal_stop_emission_by_name (widget, "key_press_event"); - return TRUE; - } - - return FALSE; + return ret; } } @@ -279,10 +268,10 @@ static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection, // assumes so and passes -1 to the dogetclientdata funcs if not // 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 + // 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 + // 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; @@ -294,16 +283,16 @@ static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection, { //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 + listbox->m_blockEvent = true; //if we don't block events we will lock the //app due to recursion!! - GtkTreeSelection* selection = + 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; + listbox->m_blockEvent = false; //Finally, send the wx event wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); @@ -316,15 +305,15 @@ static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection, event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry))); if ( listbox->HasClientObjectData() ) - event.SetClientObject( - (wxClientData*) gtk_tree_entry_get_userdata(entry) + 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)); + g_object_unref (entry); return FALSE; //We handled it/did it manually } @@ -337,7 +326,7 @@ static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection, //----------------------------------------------------------------------------- extern "C" { -static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry, +static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry, wxListBox* listbox) { if(listbox->HasClientObjectData()) @@ -364,11 +353,11 @@ static gint gtk_listbox_sort_callback(GtkTreeModel *model, gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore), a, - WXLISTBOX_DATACOLUMN_ARG(listbox), + WXLISTBOX_DATACOLUMN_ARG(listbox), &entry, -1); gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore), b, - WXLISTBOX_DATACOLUMN_ARG(listbox), + WXLISTBOX_DATACOLUMN_ARG(listbox), &entry2, -1); wxCHECK_MSG(entry, 0, wxT("Could not get entry")); wxCHECK_MSG(entry2, 0, wxT("Could not get entry2")); @@ -378,8 +367,8 @@ static gint gtk_listbox_sort_callback(GtkTreeModel *model, 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)); + g_object_unref (entry); + g_object_unref (entry2); return ret; } @@ -400,16 +389,15 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model, gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore), iter, - WXLISTBOX_DATACOLUMN_ARG(listbox), + WXLISTBOX_DATACOLUMN_ARG(listbox), &entry, -1); wxCHECK_MSG(entry, 0, wxT("Could not get entry")); - gchar* keycollatekey = g_utf8_collate_key(key, -1); + wxGtkString keycollatekey(g_utf8_collate_key(key, -1)); int ret = strcasecmp(keycollatekey, gtk_tree_entry_get_collate_key(entry)); - g_free(keycollatekey); - g_object_unref(G_OBJECT(entry)); + g_object_unref (entry); return ret != 0; } @@ -425,11 +413,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) // construction // ---------------------------------------------------------------------------- -wxListBox::wxListBox() +void wxListBox::Init() { m_treeview = (GtkTreeView*) NULL; #if wxUSE_CHECKLISTBOX - m_hasCheckBoxes = FALSE; + m_hasCheckBoxes = false; #endif // wxUSE_CHECKLISTBOX m_spacePressed = false; } @@ -452,15 +440,15 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; - m_blockEvent = FALSE; + 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; + return false; } m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); @@ -475,6 +463,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); } + + GtkScrolledWindowSetBorder(m_widget, style); + m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) ); //wxListBox doesn't have a header :) @@ -487,9 +478,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, #endif // wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST // Create the data column - gtk_tree_view_insert_column_with_attributes(m_treeview, -1, "", + gtk_tree_view_insert_column_with_attributes(m_treeview, -1, "", gtk_cell_renderer_text_new(), - "text", + "text", WXLISTBOX_DATACOLUMN, NULL); // Now create+set the model (GtkListStore) - first argument # of columns @@ -502,17 +493,17 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, 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(G_OBJECT(m_liststore)); //free on treeview destruction - + + 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 + // 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, + gtk_tree_view_set_search_equal_func(m_treeview, (GtkTreeViewSearchEqualFunc) gtk_listbox_searchequal_callback, this, NULL); @@ -521,9 +512,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview ); - gtk_tree_selection_set_select_function(selection, + gtk_tree_selection_set_select_function(selection, (GtkTreeSelectionFunc)gtk_listitem_select_cb, - this, NULL); //NULL == destroycb + this, NULL); //NULL == destroycb GtkSelectionMode mode; if (style & wxLB_MULTIPLE) @@ -543,12 +534,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_tree_selection_set_mode( selection, mode ); - //Handle sortable stuff + //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_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(m_liststore), + WXLISTBOX_DATACOLUMN, GTK_SORT_ASCENDING); //Set the sort callback @@ -562,8 +553,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_container_add (GTK_CONTAINER (m_widget), GTK_WIDGET(m_treeview) ); - + gtk_widget_show( GTK_WIDGET(m_treeview) ); + m_focusWidget = GTK_WIDGET(m_treeview); wxListBox::DoInsertItems(wxArrayString(n, choices), 0); // insert initial items @@ -584,12 +576,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, PostCreation(size); SetBestSize(size); // need this too because this is a wxControlWithItems - return TRUE; + return true; } wxListBox::~wxListBox() { - m_hasVMT = FALSE; + m_hasVMT = false; Clear(); } @@ -598,8 +590,8 @@ wxListBox::~wxListBox() // adding items // ---------------------------------------------------------------------------- -void wxListBox::GtkInsertItems(const wxArrayString& items, - void** clientData, int pos) +void wxListBox::GtkInsertItems(const wxArrayString& items, + void** clientData, unsigned int pos) { wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); @@ -607,8 +599,8 @@ void wxListBox::GtkInsertItems(const wxArrayString& items, // Create and set column ids and GValues - size_t nNum = items.GetCount(); - int nCurCount = wxListBox::GetCount(); + unsigned int nNum = items.GetCount(); + unsigned int nCurCount = wxListBox::GetCount(); wxASSERT_MSG(pos <= nCurCount, wxT("Invalid index passed to wxListBox")); GtkTreeIter* pIter = NULL; // append by default @@ -618,31 +610,31 @@ void wxListBox::GtkInsertItems(const wxArrayString& items, gboolean res = gtk_tree_model_iter_nth_child( GTK_TREE_MODEL(m_liststore), &iter, NULL, //NULL = parent = get first - pos ); + (int)pos ); if(!res) { wxLogSysError(wxT("internal wxListBox error in insertion")); - return; + return; } pIter = &iter; } - for (size_t i = 0; i < nNum; ++i) + for (unsigned int i = 0; i < nNum; ++i) { wxString label = items[i]; #if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST - if (m_hasCheckBoxes) - { - label.Prepend(wxCHECKLBOX_STRING); - } + if (m_hasCheckBoxes) + { + label.Prepend(wxCHECKLBOX_STRING); + } #endif // wxUSE_CHECKLISTBOX GtkTreeEntry* entry = gtk_tree_entry_new(); gtk_tree_entry_set_label(entry, wxConvUTF8.cWX2MB(label)); - gtk_tree_entry_set_destroy_func(entry, + gtk_tree_entry_set_destroy_func(entry, (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb, this); @@ -655,28 +647,30 @@ void wxListBox::GtkInsertItems(const wxArrayString& items, #if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST if (m_hasCheckBoxes) { - gtk_list_store_set(m_liststore, &itercur, + gtk_list_store_set(m_liststore, &itercur, 0, FALSE, //FALSE == not toggled 1, entry, -1); } else #endif - gtk_list_store_set(m_liststore, &itercur, + gtk_list_store_set(m_liststore, &itercur, 0, entry, -1); - g_object_unref(G_OBJECT(entry)); //liststore always refs :) + g_object_unref (entry); //liststore always refs :) } } -void wxListBox::DoInsertItems(const wxArrayString& items, int pos) +void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos) { + wxCHECK_RET( IsValidInsert(pos), wxT("invalid index in wxListBox::InsertItems") ); + GtkInsertItems(items, NULL, pos); } int wxListBox::DoAppend( const wxString& item ) { // Call DoInsertItems - int nWhere = wxListBox::GetCount(); + unsigned int nWhere = wxListBox::GetCount(); wxArrayString aItems; aItems.Add(item); wxListBox::DoInsertItems(aItems, nWhere); @@ -703,7 +697,7 @@ void wxListBox::Clear() gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */ } -void wxListBox::Delete( int n ) +void wxListBox::Delete(unsigned int n) { wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); @@ -714,7 +708,7 @@ void wxListBox::Delete( int n ) GTK_TREE_MODEL(m_liststore), &iter, NULL, //NULL = parent = get first n - ); + ); wxCHECK_RET( res, wxT("wrong listbox index") ); @@ -738,7 +732,7 @@ struct _GtkTreeEntry* wxListBox::GtkGetEntry(int n) const if (!res) { wxLogDebug(wxT("gtk_tree_model_iter_nth_child failed\n") - wxT("Passed in value was:[%i] List size:[%i]"), + wxT("Passed in value was:[%i] List size:[%u]"), n, wxListBox::GetCount() ); return NULL; } @@ -755,37 +749,37 @@ struct _GtkTreeEntry* wxListBox::GtkGetEntry(int n) const // client data // ---------------------------------------------------------------------------- -void* wxListBox::DoGetItemClientData( int n ) const +void* wxListBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_MSG( n >= 0 && n < wxListBox::GetCount(), NULL, + wxCHECK_MSG( IsValid(n), NULL, wxT("Invalid index passed to GetItemClientData") ); GtkTreeEntry* entry = GtkGetEntry(n); wxCHECK_MSG(entry, NULL, wxT("could not get entry")); void* userdata = gtk_tree_entry_get_userdata( entry ); - g_object_unref(G_OBJECT(entry)); + g_object_unref (entry); return userdata; } -wxClientData* wxListBox::DoGetItemClientObject( int n ) const +wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const { return (wxClientData*) wxListBox::DoGetItemClientData(n); } -void wxListBox::DoSetItemClientData( int n, void* clientData ) +void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) { - wxCHECK_RET( n >= 0 && n < wxListBox::GetCount(), + wxCHECK_RET( IsValid(n), wxT("Invalid index passed to SetItemClientData") ); GtkTreeEntry* entry = GtkGetEntry(n); wxCHECK_RET(entry, wxT("could not get entry")); gtk_tree_entry_set_userdata( entry, clientData ); - g_object_unref(G_OBJECT(entry)); + g_object_unref (entry); } -void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData ) +void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) { // wxItemContainer already deletes data for us wxListBox::DoSetItemClientData(n, (void*) clientData); @@ -795,8 +789,9 @@ void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData ) // string list access // ---------------------------------------------------------------------------- -void wxListBox::SetString( int n, const wxString &string ) +void wxListBox::SetString(unsigned int n, const wxString &string) { + wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") ); wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); GtkTreeEntry* entry = GtkGetEntry(n); @@ -805,16 +800,16 @@ void wxListBox::SetString( int n, const wxString &string ) wxString label = string; #if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST - if (m_hasCheckBoxes) - label.Prepend(wxCHECKLBOX_STRING); + if (m_hasCheckBoxes) + label.Prepend(wxCHECKLBOX_STRING); #endif // wxUSE_CHECKLISTBOX - // RN: This may look wierd but the problem is that the TreeView + // 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)); + g_object_unref (entry); bool bWasSelected = wxListBox::IsSelected(n); wxListBox::Delete(n); @@ -823,10 +818,10 @@ void wxListBox::SetString( int n, const wxString &string ) aItems.Add(label); GtkInsertItems(aItems, &userdata, n); if (bWasSelected) - wxListBox::GtkSetSelection(n, TRUE, TRUE); + wxListBox::GtkSetSelection(n, true, true); } -wxString wxListBox::GetString( int n ) const +wxString wxListBox::GetString(unsigned int n) const { wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") ); @@ -843,15 +838,15 @@ wxString wxListBox::GetString( int n ) const label.erase(0, 4); #endif // wxUSE_CHECKLISTBOX - g_object_unref(G_OBJECT(entry)); + g_object_unref (entry); return label; } -int wxListBox::GetCount() const +unsigned int wxListBox::GetCount() const { - wxCHECK_MSG( m_treeview != NULL, -1, wxT("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox") ); - return gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_liststore), NULL); + return (unsigned int)gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_liststore), NULL); } int wxListBox::FindString( const wxString &item, bool bCase ) const @@ -859,12 +854,12 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); //Sort of hackish - maybe there is a faster way - int nCount = wxListBox::GetCount(); + unsigned int nCount = wxListBox::GetCount(); - for(int i = 0; i < nCount; ++i) + for(unsigned int i = 0; i < nCount; ++i) { if( item.IsSameAs( wxListBox::GetString(i), bCase ) ) - return i; + return (int)i; } @@ -878,16 +873,16 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const int wxListBox::GetSelection() const { - wxCHECK_MSG( m_treeview != NULL, -1, wxT("invalid listbox")); - wxCHECK_MSG( HasFlag(wxLB_SINGLE), -1, + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox")); + wxCHECK_MSG( HasFlag(wxLB_SINGLE), wxNOT_FOUND, wxT("must be single selection listbox")); - GtkTreeIter iter; + GtkTreeIter iter; GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); - // only works on single-sel + // only works on single-sel if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) - return -1; + return wxNOT_FOUND; GtkTreePath* path = gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter); @@ -901,12 +896,12 @@ int wxListBox::GetSelection() const int wxListBox::GetSelections( wxArrayInt& aSelections ) const { - wxCHECK_MSG( m_treeview != NULL, -1, wxT("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); aSelections.Empty(); int i = 0; - GtkTreeIter iter; + GtkTreeIter iter; GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(m_liststore), &iter)) @@ -925,7 +920,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const bool wxListBox::IsSelected( int n ) const { - wxCHECK_MSG( m_treeview != NULL, FALSE, wxT("invalid listbox") ); + wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid listbox") ); GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); @@ -934,15 +929,39 @@ bool wxListBox::IsSelected( int n ) const GTK_TREE_MODEL(m_liststore), &iter, NULL, //NULL = parent = get first n ); - - wxCHECK_MSG( res, FALSE, wxT("Invalid index") ); + + wxCHECK_MSG( res, false, wxT("Invalid index") ); return gtk_tree_selection_iter_is_selected(selection, &iter); } void wxListBox::DoSetSelection( int n, bool select ) { - return GtkSetSelection(n, select, TRUE); //docs say no events here + // 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_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") ); + + // don't generate the selection event + GtkSetSelection(n, select, true); +} + +void wxListBox::GtkDeselectAll() +{ + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); + + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); + + m_blockEvent = true; + + gtk_tree_selection_unselect_all(selection); + + m_blockEvent = false; } void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent) @@ -966,53 +985,34 @@ void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent) else gtk_tree_selection_unselect_iter(selection, &iter); - m_blockEvent = FALSE; + m_blockEvent = false; } void wxListBox::DoSetFirstItem( int n ) { wxCHECK_RET( m_treeview, wxT("invalid listbox") ); - wxCHECK_RET( n >= 0 && n < wxListBox::GetCount(), wxT("invalid index")); + wxCHECK_RET( IsValid(n), wxT("invalid index")); //RN: I have no idea why this line is needed... if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_treeview)) return; - // terribly efficient (RN:???) - // RN: Note that evidently the vadjustment property "vadjustment" from - // GtkTreeView is different from the "gtk-vadjustment"... - // (i.e. gtk_tree_view_get_vadjustment) - const gchar *vadjustment_key = "gtk-vadjustment"; - guint vadjustment_key_id = g_quark_from_static_string (vadjustment_key); - - GtkAdjustment *adjustment = - (GtkAdjustment*) g_object_get_qdata(G_OBJECT (m_treeview), vadjustment_key_id); - wxCHECK_RET( adjustment, wxT("invalid listbox code") ); - - // Get the greater of the item heights from each column - gint cellheight = 0, cellheightcur; - GList* columnlist = gtk_tree_view_get_columns(m_treeview); - GList* curlist = columnlist; - - while(curlist) - { - gtk_tree_view_column_cell_get_size( - GTK_TREE_VIEW_COLUMN(curlist->data), - NULL, NULL, NULL, NULL, - &cellheightcur); - - cellheight = cellheightcur > cellheight ? - cellheightcur : cellheight; + GtkTreeIter iter; + gtk_tree_model_iter_nth_child( + GTK_TREE_MODEL(m_liststore), + &iter, + NULL, //NULL = parent = get first + n + ); - curlist = curlist->next; - } + GtkTreePath* path = gtk_tree_model_get_path( + GTK_TREE_MODEL(m_liststore), &iter); - g_list_free(columnlist); + // Scroll to the desired cell (0.0 == topleft alignment) + gtk_tree_view_scroll_to_cell(m_treeview, path, NULL, + TRUE, 0.0f, 0.0f); - float y = (float) (cellheight * n); - if (y > adjustment->upper - adjustment->page_size) - y = adjustment->upper - adjustment->page_size; - gtk_adjustment_set_value( adjustment, y ); + gtk_tree_path_free(path); } // ---------------------------------------------------------------------------- @@ -1021,15 +1021,20 @@ void wxListBox::DoSetFirstItem( int n ) int wxListBox::DoListHitTest(const wxPoint& point) const { + // 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), + 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, + m_treeview, point.x - binx, point.y - biny, &path, @@ -1066,9 +1071,9 @@ GtkWidget *wxListBox::GetConnectWidget() return GTK_WIDGET(m_treeview); } -bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return (window == gtk_tree_view_get_bin_window(m_treeview)); + return gtk_tree_view_get_bin_window(m_treeview); } void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) @@ -1078,7 +1083,7 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) 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 ); } @@ -1087,26 +1092,6 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) gtk_widget_modify_style( GTK_WIDGET(m_treeview), style ); } -void wxListBox::OnInternalIdle() -{ - //RN: Is this needed anymore? - wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; - - if (GTK_WIDGET(m_treeview)->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. */ - GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview); - gdk_window_set_cursor( window, cursor.GetCursor() ); - } - - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); -} - wxSize wxListBox::DoGetBestSize() const { wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view")); @@ -1117,15 +1102,15 @@ wxSize wxListBox::DoGetBestSize() const int lbWidth = 3 * cx; int lbHeight = 10; - // Get the visible area of the tree view (limit to the 10th item + // Get the visible area of the tree view (limit to the 10th item // so that it isn't too big) - int count = GetCount(); + unsigned int count = GetCount(); if (count) { int wLine; // Find the widest line - for(int i = 0; i < count; i++) { + for(unsigned int i = 0; i < count; i++) { wxString str(GetString(i)); GetTextExtent(str, &wLine, NULL); lbWidth = wxMax(lbWidth, wLine); @@ -1143,11 +1128,11 @@ wxSize wxListBox::DoGetBestSize() const } #endif - // don't make the listbox too tall (limit height to around 10 items) but don't - // make it too small neither + // 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);