X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/937013e0fd914d4c42f9f5ec98da665986b93dfa..55410bb4f67febe1ca20654f078ea4fb9a6223ae:/src/gtk/listbox.cpp?ds=inline diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 0f28034f81..842f157f5c 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -119,17 +119,17 @@ 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)) + { + listbox->CalcAndSendEvent(); + } + else // single selection { - wxArrayInt selections; - listbox->GetSelections( selections ); + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); + event.SetEventObject( listbox ); - if (selections.GetCount() == 0) + int index = listbox->GetSelection(); + if (index == wxNOT_FOUND) { // indicate that this is a deselection event.SetExtraLong( 0 ); @@ -141,28 +141,59 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection), } else { + GtkTreeEntry* entry = listbox->GtkGetEntry( index ); + // indicate that this is a selection event.SetExtraLong( 1 ); - event.SetInt( selections[0] ); + + event.SetInt( index ); + 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->HandleWindowEvent( event ); + + g_object_unref (entry); } } - else - { - int index = listbox->GetSelection(); - if (index == wxNOT_FOUND) - { - // indicate that this is a deselection - event.SetExtraLong( 0 ); - event.SetInt( -1 ); +} +} - listbox->HandleWindowEvent( event ); +//----------------------------------------------------------------------------- +// "key_press_event" +//----------------------------------------------------------------------------- - return; - } +extern "C" { +static gboolean +gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget), + GdkEventKey *gdk_event, + wxListBox *listbox ) +{ + if ((gdk_event->keyval == GDK_Return) || + (gdk_event->keyval == GDK_ISO_Enter) || + (gdk_event->keyval == GDK_KP_Enter)) + { + 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 ); // indicate that this is a selection @@ -178,11 +209,30 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection), else if ( listbox->HasClientUntypedData() ) event.SetClientData( gtk_tree_entry_get_userdata(entry) ); - listbox->HandleWindowEvent( event ); + /* bool ret = */ listbox->HandleWindowEvent( event ); g_object_unref (entry); + +// wxMac and wxMSW always invoke default action +// if (!ret) + { + // DClick not handled -> invoke default action + wxWindow *tlw = wxGetTopLevelParent( listbox ); + if (tlw) + { + GtkWindow *gtk_window = GTK_WINDOW( tlw->GetHandle() ); + if (gtk_window) + gtk_window_activate_default( gtk_window ); + } + } + + // Always intercept, otherwise we'd get another dclick + // event from row_activated + return TRUE; } } + + return FALSE; } } @@ -280,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 @@ -304,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 )) { @@ -313,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), @@ -326,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( ) ); @@ -372,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 @@ -425,11 +465,18 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, g_signal_connect_after(m_treeview, "row-activated", G_CALLBACK(gtk_listbox_row_activated_callback), this); + // for intercepting dclick generation by + g_signal_connect (m_treeview, "key_press_event", + G_CALLBACK (gtk_listbox_key_press_callback), + this); m_parent->DoAddChild( this ); PostCreation(size); 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; } @@ -440,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 // ---------------------------------------------------------------------------- @@ -447,7 +521,7 @@ wxListBox::~wxListBox() int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, void **clientData, - wxClientDataType WXUNUSED(type)) + wxClientDataType type) { wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); @@ -472,17 +546,19 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb, this); - if (clientData) - gtk_tree_entry_set_userdata(entry, clientData[i]); - GtkTreeIter itercur; gtk_list_store_insert_before(m_liststore, &itercur, pIter); GtkSetItem(itercur, entry); g_object_unref (entry); + + if (clientData) + AssignNewItemClientData(GtkGetIndexFor(itercur), clientData, i, type); } + UpdateOldSelections(); + return pos + numItems - 1; } @@ -494,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) @@ -505,12 +585,16 @@ void wxListBox::DoDeleteOneItem(unsigned int n) InvalidateBestSize(); + GtkDisableEvents(); // just in case + GtkTreeIter iter; wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("wrong listbox index") ); // this returns false if iter is invalid (e.g. deleting item at end) but // since we don't use iter, we ignore the return value gtk_list_store_remove(m_liststore, &iter); + + GtkEnableEvents(); } // ---------------------------------------------------------------------------- @@ -694,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); @@ -726,44 +810,26 @@ bool wxListBox::IsSelected( int n ) const 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; - if (select) gtk_tree_selection_select_iter(selection, &iter); else @@ -776,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")); @@ -797,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 // ---------------------------------------------------------------------------- @@ -844,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 @@ -886,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;