X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be4bb86efdafbc00c8ebd57063b8b9550308ab84..8ca1a013e4e699724040ff1f514dab3b4a11d3c9:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 95636a79d5..15c70a351d 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -32,7 +32,6 @@ #include "wx/tooltip.h" #endif -#include #include #include @@ -68,8 +67,6 @@ gtk_listbox_row_activated_callback(GtkTreeView *treeview, GtkTreeViewColumn *col, wxListBox *listbox) { - if (g_isIdle) wxapp_install_idle_handler(); - if (g_blockEventsOnDrag) return; if (g_blockEventsOnScroll) return; @@ -83,7 +80,7 @@ gtk_listbox_row_activated_callback(GtkTreeView *treeview, if (listbox->IsSelected(sel)) { GtkTreeEntry* entry = listbox->GtkGetEntry(sel); - + if (entry) { event.SetInt(sel); @@ -93,7 +90,7 @@ gtk_listbox_row_activated_callback(GtkTreeView *treeview, event.SetClientObject( (wxClientData*) gtk_tree_entry_get_userdata(entry) ); else if ( listbox->HasClientUntypedData() ) event.SetClientData( gtk_tree_entry_get_userdata(entry) ); - + g_object_unref (entry); } else @@ -111,34 +108,6 @@ gtk_listbox_row_activated_callback(GtkTreeView *treeview, } } -//----------------------------------------------------------------------------- -// "key_press_event" -//----------------------------------------------------------------------------- - -extern "C" { -static gint -gtk_listbox_key_press_callback( GtkWidget *widget, - GdkEventKey *gdk_event, - wxListBox *listbox ) -{ - if (g_blockEventsOnDrag) return 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 ); - if (listbox->GetEventHandler()->ProcessEvent( new_event )) - return TRUE; - } - - return FALSE; -} -} - //----------------------------------------------------------------------------- // "changed" //----------------------------------------------------------------------------- @@ -148,9 +117,9 @@ static void gtk_listitem_changed_callback( GtkTreeSelection* selection, wxListBox *listbox ) { if (g_blockEventsOnDrag) return; - + if (listbox->m_blockEvent) return; - + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); event.SetEventObject( listbox ); @@ -158,15 +127,15 @@ gtk_listitem_changed_callback( GtkTreeSelection* selection, wxListBox *listbox ) { wxArrayInt selections; listbox->GetSelections( selections ); - + if (selections.GetCount() == 0) { // indicate that this is a deselection event.SetExtraLong( 0 ); event.SetInt( -1 ); - + listbox->GetEventHandler()->ProcessEvent( event ); - + return; } else @@ -174,7 +143,7 @@ gtk_listitem_changed_callback( GtkTreeSelection* selection, wxListBox *listbox ) // indicate that this is a selection event.SetExtraLong( 1 ); event.SetInt( selections[0] ); - + listbox->GetEventHandler()->ProcessEvent( event ); } } @@ -186,9 +155,9 @@ gtk_listitem_changed_callback( GtkTreeSelection* selection, wxListBox *listbox ) // indicate that this is a deselection event.SetExtraLong( 0 ); event.SetInt( -1 ); - + listbox->GetEventHandler()->ProcessEvent( event ); - + return; } else @@ -334,8 +303,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { - m_needParent = true; - m_acceptsFocus = true; m_blockEvent = false; if (!PreCreation( parent, pos, size ) || @@ -406,7 +373,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview ); - + g_signal_connect_after (selection, "changed", G_CALLBACK (gtk_listitem_changed_callback), this); @@ -457,11 +424,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, g_signal_connect_after(m_treeview, "row-activated", G_CALLBACK(gtk_listbox_row_activated_callback), this); - // for panel navigation - g_signal_connect (m_treeview, "key_press_event", - G_CALLBACK (gtk_listbox_key_press_callback), - this); - m_parent->DoAddChild( this ); PostCreation(size); @@ -498,15 +460,8 @@ void wxListBox::GtkInsertItems(const wxArrayString& items, GtkTreeIter iter; if (pos != nCurCount) { - gboolean res = gtk_tree_model_iter_nth_child( - GTK_TREE_MODEL(m_liststore), - &iter, NULL, //NULL = parent = get first - (int)pos ); - if(!res) - { - wxLogSysError(wxT("internal wxListBox error in insertion")); - return; - } + wxCHECK_RET( GtkGetIteratorFor(pos, &iter), + wxT("internal wxListBox error in insertion") ); pIter = &iter; } @@ -527,19 +482,9 @@ void wxListBox::GtkInsertItems(const wxArrayString& items, GtkTreeIter itercur; gtk_list_store_insert_before(m_liststore, &itercur, pIter); -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - { - 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); + GtkSetItem(itercur, entry); - g_object_unref (entry); //liststore always refs :) + g_object_unref (entry); } } @@ -565,37 +510,11 @@ int wxListBox::DoAppend( const wxString& item ) GtkTreeIter itercur; gtk_list_store_insert_before( m_liststore, &itercur, NULL ); -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - { - 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 (entry); //liststore always refs :) - - GtkTreePath* path = gtk_tree_model_get_path( - GTK_TREE_MODEL(m_liststore), - &itercur); - - gint* pIntPath = gtk_tree_path_get_indices(path); - - if (pIntPath == NULL) - { - wxLogSysError(wxT("internal wxListBox error in insertion")); - return wxNOT_FOUND; - } - - int index = pIntPath[0]; + GtkSetItem(itercur, entry); - gtk_tree_path_free( path ); + g_object_unref (entry); - return index; + return GtkGetIndexFor(itercur); } void wxListBox::DoSetItems( const wxArrayString& items, @@ -625,39 +544,52 @@ void wxListBox::Delete(unsigned int n) InvalidateBestSize(); 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("wrong listbox index") ); + wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("wrong listbox index") ); - //this returns false if iter is invalid (i.e. deleting item - //at end) but since we don't use iter, well... :) + // 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); } // ---------------------------------------------------------------------------- -// get GtkTreeEntry from position (note: you need to g_unref it if valid) +// helper functions for working with iterators // ---------------------------------------------------------------------------- -struct _GtkTreeEntry* wxListBox::GtkGetEntry(int n) const +bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const { - GtkTreeIter iter; - gboolean res = gtk_tree_model_iter_nth_child( - GTK_TREE_MODEL(m_liststore), - &iter, NULL, //NULL = parent = get first - n ); - - if (!res) + if ( !gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_liststore), + iter, NULL, pos) ) { - wxLogDebug(wxT("gtk_tree_model_iter_nth_child failed\n") - wxT("Passed in value was:[%i] List size:[%u]"), - n, wxListBox::GetCount() ); - return NULL; + wxLogDebug(wxT("gtk_tree_model_iter_nth_child(%u) failed"), pos); + return false; } + return true; +} + +int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const +{ + GtkTreePath *path = + gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter); + + gint* pIntPath = gtk_tree_path_get_indices(path); + + wxCHECK_MSG( pIntPath, wxNOT_FOUND, _T("failed to get iterator path") ); + + int idx = pIntPath[0]; + + gtk_tree_path_free( path ); + + return idx; +} + +// get GtkTreeEntry from position (note: you need to g_unref it if valid) +GtkTreeEntry *wxListBox::GtkGetEntry(unsigned n) const +{ + GtkTreeIter iter; + if ( !GtkGetIteratorFor(n, &iter) ) + return NULL; + GtkTreeEntry* entry = NULL; gtk_tree_model_get(GTK_TREE_MODEL(m_liststore), &iter, @@ -666,6 +598,23 @@ struct _GtkTreeEntry* wxListBox::GtkGetEntry(int n) const return entry; } +void wxListBox::GtkSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry) +{ +#if wxUSE_CHECKLISTBOX + if ( m_hasCheckBoxes ) + { + gtk_list_store_set(m_liststore, &iter, + 0, FALSE, // FALSE == not toggled + 1, entry, + -1); + } + else +#endif // wxUSE_CHECKLISTBOX + { + gtk_list_store_set(m_liststore, &iter, 0, entry, -1); + } +} + // ---------------------------------------------------------------------------- // client data // ---------------------------------------------------------------------------- @@ -710,7 +659,7 @@ void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) // string list access // ---------------------------------------------------------------------------- -void wxListBox::SetString(unsigned int n, const wxString &string) +void wxListBox::SetString(unsigned int n, const wxString& label) { wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") ); wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); @@ -718,23 +667,16 @@ void wxListBox::SetString(unsigned int n, const wxString &string) GtkTreeEntry* entry = GtkGetEntry(n); wxCHECK_RET( entry, wxT("wrong listbox index") ); - wxString label = string; + // update the item itself + gtk_tree_entry_set_label(entry, wxGTK_CONV(label)); - // 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 (entry); + // and update the model which will refresh the tree too + GtkTreeIter iter; + wxCHECK_RET( GtkGetIteratorFor(n, &iter), _T("failed to get iterator") ); - bool bWasSelected = wxListBox::IsSelected(n); - wxListBox::Delete(n); + // FIXME: this resets the checked status of a wxCheckListBox item - wxArrayString aItems; - aItems.Add(label); - GtkInsertItems(aItems, &userdata, n); - if (bWasSelected) - wxListBox::GtkSetSelection(n, true, true); + GtkSetItem(iter, entry); } wxString wxListBox::GetString(unsigned int n) const @@ -792,14 +734,7 @@ int wxListBox::GetSelection() const if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) return wxNOT_FOUND; - GtkTreePath* path = - gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter); - - int sel = gtk_tree_path_get_indices(path)[0]; - - gtk_tree_path_free(path); - - return sel; + return GtkGetIndexFor(iter); } int wxListBox::GetSelections( wxArrayInt& aSelections ) const @@ -833,12 +768,7 @@ bool wxListBox::IsSelected( int n ) const GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); GtkTreeIter iter; - gboolean res = gtk_tree_model_iter_nth_child( - GTK_TREE_MODEL(m_liststore), - &iter, NULL, //NULL = parent = get first - n ); - - wxCHECK_MSG( res, false, wxT("Invalid index") ); + wxCHECK_MSG( GtkGetIteratorFor(n, &iter), false, wxT("Invalid index") ); return gtk_tree_selection_iter_is_selected(selection, &iter); } @@ -879,12 +809,7 @@ void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent) GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); 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") ); + wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("Invalid index") ); m_blockEvent = blockEvent; @@ -906,12 +831,8 @@ void wxListBox::DoSetFirstItem( int n ) return; GtkTreeIter iter; - gtk_tree_model_iter_nth_child( - GTK_TREE_MODEL(m_liststore), - &iter, - NULL, //NULL = parent = get first - n - ); + if ( !GtkGetIteratorFor(n, &iter) ) + return; GtkTreePath* path = gtk_tree_model_get_path( GTK_TREE_MODEL(m_liststore), &iter); @@ -965,10 +886,10 @@ int wxListBox::DoListHitTest(const wxPoint& point) const // ---------------------------------------------------------------------------- #if wxUSE_TOOLTIPS -void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) +void wxListBox::ApplyToolTip( GtkTooltips *tips, const gchar *tip ) { // RN: Is this needed anymore? - gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), wxGTK_CONV(tip), (gchar*) NULL ); + gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, (gchar*) NULL ); } #endif // wxUSE_TOOLTIPS