X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a625c5b6c0d1c0f137bfbbdd98608c194017da75..d67fc8b73514909eb198223333e11be4d900f431:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index f1e5f96b1e..0a266f5376 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -79,7 +79,7 @@ gtk_listbox_row_activated_callback(GtkTreeView * WXUNUSED(treeview), if (listbox->IsSelected(sel)) { - GtkTreeEntry* entry = listbox->GtkGetEntry(sel); + GtkTreeEntry* entry = listbox->GTKGetEntry(sel); if (entry) { @@ -119,37 +119,15 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection), { if (g_blockEventsOnDrag) return; - if (listbox->m_blockEvent) return; - - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); - event.SetEventObject( listbox ); - - if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED)) + if (listbox->HasFlag(wxLB_MULTIPLE | wxLB_EXTENDED)) { - wxArrayInt selections; - listbox->GetSelections( selections ); - - if (selections.GetCount() == 0) - { - // indicate that this is a deselection - event.SetExtraLong( 0 ); - event.SetInt( -1 ); - - listbox->HandleWindowEvent( event ); - - return; - } - else - { - // indicate that this is a selection - event.SetExtraLong( 1 ); - event.SetInt( selections[0] ); - - listbox->HandleWindowEvent( event ); - } + listbox->CalcAndSendEvent(); } - else + else // single selection { + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); + event.SetEventObject( listbox ); + int index = listbox->GetSelection(); if (index == wxNOT_FOUND) { @@ -163,7 +141,7 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection), } else { - GtkTreeEntry* entry = listbox->GtkGetEntry( index ); + GtkTreeEntry* entry = listbox->GTKGetEntry( index ); // indicate that this is a selection event.SetExtraLong( 1 ); @@ -191,22 +169,32 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection), //----------------------------------------------------------------------------- extern "C" { -static gint +static gboolean gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget), GdkEventKey *gdk_event, wxListBox *listbox ) { - if ((gdk_event->keyval == GDK_Return) || + if ((gdk_event->keyval == GDK_Return) || (gdk_event->keyval == GDK_ISO_Enter) || (gdk_event->keyval == GDK_KP_Enter)) { - int index = listbox->GetSelection(); + int index = -1; + if (!listbox->HasMultipleSelection()) + index = listbox->GetSelection(); + else + { + wxArrayInt sels; + if (listbox->GetSelections( sels ) < 1) + return FALSE; + index = sels[0]; + } + if (index != wxNOT_FOUND) { wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); event.SetEventObject( listbox ); - - GtkTreeEntry* entry = listbox->GtkGetEntry( index ); + + GtkTreeEntry* entry = listbox->GTKGetEntry( index ); // indicate that this is a selection event.SetExtraLong( 1 ); @@ -221,11 +209,12 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget), else if ( listbox->HasClientUntypedData() ) event.SetClientData( gtk_tree_entry_get_userdata(entry) ); - bool ret = listbox->HandleWindowEvent( event ); + /* bool ret = */ listbox->HandleWindowEvent( event ); g_object_unref (entry); - - if (!ret) + +// wxMac and wxMSW always invoke default action +// if (!ret) { // DClick not handled -> invoke default action wxWindow *tlw = wxGetTopLevelParent( listbox ); @@ -236,13 +225,13 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget), gtk_window_activate_default( gtk_window ); } } - + // Always intercept, otherwise we'd get another dclick // event from row_activated return TRUE; } } - + return FALSE; } } @@ -341,7 +330,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) void wxListBox::Init() { - m_treeview = (GtkTreeView*) NULL; + m_treeview = NULL; #if wxUSE_CHECKLISTBOX m_hasCheckBoxes = false; #endif // wxUSE_CHECKLISTBOX @@ -365,8 +354,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { - m_blockEvent = false; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { @@ -374,7 +361,8 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, return false; } - m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); + m_widget = gtk_scrolled_window_new( NULL, NULL ); + g_object_ref(m_widget); if (style & wxLB_ALWAYS_SB) { gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), @@ -387,7 +375,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, } - GtkScrolledWindowSetBorder(m_widget, style); + GTKScrolledWindowSetBorder(m_widget, style); m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) ); @@ -433,28 +421,19 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, 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) + // GTK_SELECTION_EXTENDED is a deprecated synonym for GTK_SELECTION_MULTIPLE + if ( style & (wxLB_MULTIPLE | wxLB_EXTENDED) ) { mode = GTK_SELECTION_MULTIPLE; } - else if (style & wxLB_EXTENDED) - { - mode = GTK_SELECTION_EXTENDED; - } - else + else // no multi-selection flags specified { - // if style was 0 set single mode m_windowStyle |= wxLB_SINGLE; mode = GTK_SELECTION_SINGLE; } + GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview ); gtk_tree_selection_set_mode( selection, mode ); // Handle sortable stuff @@ -495,6 +474,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, PostCreation(size); SetInitialSize(size); // need this too because this is a wxControlWithItems + g_signal_connect_after (selection, "changed", + G_CALLBACK (gtk_listitem_changed_callback), this); + return true; } @@ -505,6 +487,33 @@ wxListBox::~wxListBox() Clear(); } +void wxListBox::GTKDisableEvents() +{ + GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview ); + + g_signal_handlers_block_by_func(selection, + (gpointer) gtk_listitem_changed_callback, this); +} + +void wxListBox::GTKEnableEvents() +{ + GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview ); + + g_signal_handlers_unblock_by_func(selection, + (gpointer) gtk_listitem_changed_callback, this); + + UpdateOldSelections(); +} + + +void wxListBox::Update() +{ + wxWindow::Update(); + + if (m_treeview) + gdk_window_process_updates(GTK_WIDGET(m_treeview)->window, TRUE); +} + // ---------------------------------------------------------------------------- // adding items // ---------------------------------------------------------------------------- @@ -522,7 +531,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, GtkTreeIter iter; if ( pos != GetCount() ) { - wxCHECK_MSG( GtkGetIteratorFor(pos, &iter), wxNOT_FOUND, + wxCHECK_MSG( GTKGetIteratorFor(pos, &iter), wxNOT_FOUND, wxT("internal wxListBox error in insertion") ); pIter = &iter; @@ -540,14 +549,16 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, GtkTreeIter itercur; gtk_list_store_insert_before(m_liststore, &itercur, pIter); - GtkSetItem(itercur, entry); + GTKSetItem(itercur, entry); g_object_unref (entry); if (clientData) - AssignNewItemClientData(GtkGetIndexFor(itercur), clientData, i, type); + AssignNewItemClientData(GTKGetIndexFor(itercur), clientData, i, type); } + UpdateOldSelections(); + return pos + numItems - 1; } @@ -559,9 +570,13 @@ void wxListBox::DoClear() { wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); + GTKDisableEvents(); // just in case + InvalidateBestSize(); gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */ + + GTKEnableEvents(); } void wxListBox::DoDeleteOneItem(unsigned int n) @@ -570,19 +585,23 @@ void wxListBox::DoDeleteOneItem(unsigned int n) InvalidateBestSize(); + GTKDisableEvents(); // just in case + GtkTreeIter iter; - wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("wrong listbox index") ); + 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); + + GTKEnableEvents(); } // ---------------------------------------------------------------------------- // helper functions for working with iterators // ---------------------------------------------------------------------------- -bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const +bool wxListBox::GTKGetIteratorFor(unsigned pos, GtkTreeIter *iter) const { if ( !gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_liststore), iter, NULL, pos) ) @@ -594,14 +613,14 @@ bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const return true; } -int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const +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") ); + wxCHECK_MSG( pIntPath, wxNOT_FOUND, wxT("failed to get iterator path") ); int idx = pIntPath[0]; @@ -611,10 +630,10 @@ int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const } // get GtkTreeEntry from position (note: you need to g_unref it if valid) -GtkTreeEntry *wxListBox::GtkGetEntry(unsigned n) const +GtkTreeEntry *wxListBox::GTKGetEntry(unsigned n) const { GtkTreeIter iter; - if ( !GtkGetIteratorFor(n, &iter) ) + if ( !GTKGetIteratorFor(n, &iter) ) return NULL; @@ -625,7 +644,7 @@ GtkTreeEntry *wxListBox::GtkGetEntry(unsigned n) const return entry; } -void wxListBox::GtkSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry) +void wxListBox::GTKSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry) { #if wxUSE_CHECKLISTBOX if ( m_hasCheckBoxes ) @@ -651,7 +670,7 @@ void* wxListBox::DoGetItemClientData(unsigned int n) const wxCHECK_MSG( IsValid(n), NULL, wxT("Invalid index passed to GetItemClientData") ); - GtkTreeEntry* entry = GtkGetEntry(n); + GtkTreeEntry* entry = GTKGetEntry(n); wxCHECK_MSG(entry, NULL, wxT("could not get entry")); void* userdata = gtk_tree_entry_get_userdata( entry ); @@ -664,7 +683,7 @@ void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) wxCHECK_RET( IsValid(n), wxT("Invalid index passed to SetItemClientData") ); - GtkTreeEntry* entry = GtkGetEntry(n); + GtkTreeEntry* entry = GTKGetEntry(n); wxCHECK_RET(entry, wxT("could not get entry")); gtk_tree_entry_set_userdata( entry, clientData ); @@ -680,7 +699,7 @@ 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") ); - GtkTreeEntry* entry = GtkGetEntry(n); + GtkTreeEntry* entry = GTKGetEntry(n); wxCHECK_RET( entry, wxT("wrong listbox index") ); // update the item itself @@ -688,18 +707,18 @@ void wxListBox::SetString(unsigned int n, const wxString& label) // and update the model which will refresh the tree too GtkTreeIter iter; - wxCHECK_RET( GtkGetIteratorFor(n, &iter), _T("failed to get iterator") ); + wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("failed to get iterator") ); // FIXME: this resets the checked status of a wxCheckListBox item - GtkSetItem(iter, entry); + GTKSetItem(iter, entry); } wxString wxListBox::GetString(unsigned int n) const { wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") ); - GtkTreeEntry* entry = GtkGetEntry(n); + GtkTreeEntry* entry = GTKGetEntry(n); wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") ); wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ); @@ -750,7 +769,7 @@ int wxListBox::GetSelection() const if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) return wxNOT_FOUND; - return GtkGetIndexFor(iter); + return GTKGetIndexFor(iter); } int wxListBox::GetSelections( wxArrayInt& aSelections ) const @@ -759,7 +778,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const aSelections.Empty(); - int i = 0; + int i = 0; GtkTreeIter iter; GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); @@ -784,50 +803,32 @@ bool wxListBox::IsSelected( int n ) const GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); GtkTreeIter iter; - wxCHECK_MSG( GtkGetIteratorFor(n, &iter), false, wxT("Invalid index") ); + wxCHECK_MSG( GTKGetIteratorFor(n, &iter), false, wxT("Invalid index") ); return gtk_tree_selection_iter_is_selected(selection, &iter); } void wxListBox::DoSetSelection( int n, bool select ) { + wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") ); + + GTKDisableEvents(); + + GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); + // passing -1 to SetSelection() is documented to deselect all items if ( n == wxNOT_FOUND ) { - // ... and not generate any events in the process - GtkDeselectAll(); + gtk_tree_selection_unselect_all(selection); + GTKEnableEvents(); 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) -{ - 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; + wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("Invalid index") ); if (select) gtk_tree_selection_select_iter(selection, &iter); @@ -841,10 +842,10 @@ void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent) gtk_tree_path_free(path); - m_blockEvent = false; + GTKEnableEvents(); } -void wxListBox::DoSetFirstItem( int n ) +void wxListBox::DoScrollToCell(int n, float alignY, float alignX) { wxCHECK_RET( m_treeview, wxT("invalid listbox") ); wxCHECK_RET( IsValid(n), wxT("invalid index")); @@ -854,7 +855,7 @@ void wxListBox::DoSetFirstItem( int n ) return; GtkTreeIter iter; - if ( !GtkGetIteratorFor(n, &iter) ) + if ( !GTKGetIteratorFor(n, &iter) ) return; GtkTreePath* path = gtk_tree_model_get_path( @@ -862,11 +863,21 @@ void wxListBox::DoSetFirstItem( int n ) // Scroll to the desired cell (0.0 == topleft alignment) gtk_tree_view_scroll_to_cell(m_treeview, path, NULL, - TRUE, 0.0f, 0.0f); + TRUE, alignY, alignX); gtk_tree_path_free(path); } +void wxListBox::DoSetFirstItem(int n) +{ + DoScrollToCell(n, 0, 0); +} + +void wxListBox::EnsureVisible(int n) +{ + DoScrollToCell(n, 0.5, 0); +} + // ---------------------------------------------------------------------------- // hittest // ---------------------------------------------------------------------------- @@ -909,10 +920,10 @@ int wxListBox::DoListHitTest(const wxPoint& point) const // ---------------------------------------------------------------------------- #if wxUSE_TOOLTIPS -void wxListBox::ApplyToolTip( GtkTooltips *tips, const gchar *tip ) +void wxListBox::GTKApplyToolTip( GtkTooltips *tips, const gchar *tip ) { // RN: Is this needed anymore? - gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, (gchar*) NULL ); + gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, NULL ); } #endif // wxUSE_TOOLTIPS @@ -951,43 +962,40 @@ wxSize wxListBox::DoGetBestSize() const // Start with a minimum size that's not too small int cx, cy; GetTextExtent( wxT("X"), &cx, &cy); - int lbWidth = 3 * cx; + int lbWidth = 0; 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) + // Find the widest string. + const unsigned int count = GetCount(); + if ( count ) { int wLine; - - // Find the widest line - for(unsigned int i = 0; i < count; i++) { - wxString str(GetString(i)); - GetTextExtent(str, &wLine, NULL); - lbWidth = wxMax(lbWidth, wLine); + for ( unsigned int i = 0; i < count; i++ ) + { + GetTextExtent(GetString(i), &wLine, NULL); + if ( wLine > lbWidth ) + lbWidth = wLine; } + } - lbWidth += 3 * cx; + lbWidth += 3 * cx; - // And just a bit more for the checkbox if present and then some - // (these are rough guesses) + // And just a bit more for the checkbox if present and then some + // (these are rough guesses) #if wxUSE_CHECKLISTBOX - if ( m_hasCheckBoxes ) - { - lbWidth += 35; - cy = cy > 25 ? cy : 25; // rough height of checkbox - } -#endif - - // don't make the listbox too tall (limit height to around 10 items) but don't - // make it too small neither - lbHeight = (cy+4) * wxMin(wxMax(count, 3), 10); + if ( m_hasCheckBoxes ) + { + lbWidth += 35; + cy = cy > 25 ? cy : 25; // rough height of checkbox } +#endif // Add room for the scrollbar lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); + // Don't make the listbox too tall but don't make it too small neither + lbHeight = (cy+4) * wxMin(wxMax(count, 3), 10); + wxSize best(lbWidth, lbHeight); CacheBestSize(best); return best;