{
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)
{
(gdk_event->keyval == GDK_ISO_Enter) ||
(gdk_event->keyval == GDK_KP_Enter))
{
- int index = listbox->GetSelection();
- if (index != wxNOT_FOUND)
+ 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 );
long style, const wxValidator& validator,
const wxString &name )
{
- m_blockEvent = false;
-
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
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)
+ else // no multi-selection flags specified
{
- mode = GTK_SELECTION_EXTENDED;
- }
- else
- {
- // 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
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;
}
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
// ----------------------------------------------------------------------------
AssignNewItemClientData(GtkGetIndexFor(itercur), clientData, i, type);
}
+ UpdateOldSelections();
+
return pos + numItems - 1;
}
{
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)
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();
}
// ----------------------------------------------------------------------------
aSelections.Empty();
- int i = 0;
+ int i = 0;
GtkTreeIter iter;
GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
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
gtk_tree_path_free(path);
- m_blockEvent = false;
+ GtkEnableEvents();
}
void wxListBox::DoScrollToCell(int n, float alignY, float alignX)
// 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;
projects / wxWidgets.git / blobdiff