gdk_threads_enter();
gtk_idle_remove( data->m_tag );
-
+
data->m_listbox->SetFirstItem( data->m_item );
-
+
delete data;
-
+
gdk_threads_leave();
return TRUE;
// eat return in all modes
ret = TRUE;
}
-
+
#if wxUSE_CHECKLISTBOX
if ((gdk_event->keyval == ' ') && (listbox->m_hasCheckBoxes) && (!ret))
{
gtk_listitem_select_cb( widget, listbox, FALSE );
}
-static void gtk_listitem_select_cb( GtkWidget *WXUNUSED(widget), wxListBox *listbox, bool is_selection )
+static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!listbox->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
+
+ if (listbox->m_blockEvent) return;
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
event.SetEventObject( listbox );
- event.SetExtraLong( (long) is_selection );
+
+// MSW doesn't do that either
+// event.SetExtraLong( (long) is_selection );
+
+
+ if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0)
+ {
+ int sel = listbox->GtkGetIndex( widget );
+
+ if (listbox->m_prevSelection != sel)
+ gtk_list_unselect_item( listbox->m_list, listbox->m_prevSelection );
+
+ listbox->m_prevSelection = sel;
+ }
wxArrayInt aSelections;
int n, count = listbox->GetSelections(aSelections);
event.m_commandInt = n;
- listbox->GetEventHandler()->AddPendingEvent( event );
-// listbox->GetEventHandler()->ProcessEvent( event );
+// No longer required with new code in wxLB_SINGLE
+// listbox->GetEventHandler()->AddPendingEvent( event );
+ listbox->GetEventHandler()->ProcessEvent( event );
}
//-----------------------------------------------------------------------------
{
m_needParent = TRUE;
m_acceptsFocus = TRUE;
+ m_isListBox = TRUE;
+ m_prevSelection = 0; // or -1 ??
+ m_blockEvent = FALSE;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
// if style was 0 set single mode
m_windowStyle |= wxLB_SINGLE;
- mode = GTK_SELECTION_BROWSE;
+ mode = GTK_SELECTION_MULTIPLE;
}
gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
gtk_widget_show( GTK_WIDGET(m_list) );
- SetBestSize( size );
-
if ( style & wxLB_SORT )
{
// this will change DoAppend() behaviour
DoAppend(choices[i]);
}
+ // call it after appending the strings to the listbox, otherwise it doesn't
+ // work correctly
+ SetBestSize( size );
+
m_parent->DoAddChild( this );
PostCreation();
m_hasVMT = FALSE;
Clear();
-
+
if (m_strings)
delete m_strings;
}
for (size_t n = 0; n < nItems; n++)
{
index = m_strings->Add( items[n] );
-
+
if (index != GetCount())
{
GtkAddItem( items[n], index );
gtk_signal_connect( GTK_OBJECT(list_item), "select",
GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
- if (HasFlag(wxLB_MULTIPLE))
+ if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
{
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
- gtk_list_clear_items( m_list, 0, Number() );
+ gtk_list_clear_items( m_list, 0, GetCount() );
+
+ if ( GTK_LIST(m_list)->last_focus_child != NULL )
+ {
+ // This should be NULL, I think.
+ GTK_LIST(m_list)->last_focus_child = NULL;
+ }
if ( HasClientObjectData() )
{
{
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
- GtkDisableEvents();
+ m_blockEvent = TRUE;
if (select)
+ {
+ if ((m_windowStyle & wxLB_SINGLE) != 0)
+ gtk_list_unselect_item( m_list, m_prevSelection );
gtk_list_select_item( m_list, n );
+ m_prevSelection = n;
+ }
else
gtk_list_unselect_item( m_list, n );
- GtkEnableEvents();
+ m_blockEvent = FALSE;
}
void wxListBox::DoSetFirstItem( int n )
if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_list))
return;
-
- // terribly efficient
+
+ // terribly efficient
const gchar *vadjustment_key = "gtk-vadjustment";
guint vadjustment_key_id = g_quark_from_static_string (vadjustment_key);
-
- GtkAdjustment *adjustment =
+
+ GtkAdjustment *adjustment =
(GtkAdjustment*) gtk_object_get_data_by_id (GTK_OBJECT (m_list), vadjustment_key_id);
wxCHECK_RET( adjustment, wxT("invalid listbox code") );
GList *target = g_list_nth( m_list->children, n );
wxCHECK_RET( target, wxT("invalid listbox index") );
-
+
GtkWidget *item = GTK_WIDGET(target->data);
wxCHECK_RET( item, wxT("invalid listbox code") );
data->m_listbox = this;
data->m_item = n;
data->m_tag = gtk_idle_add_priority( 800, wxlistbox_idle_callback, (gpointer) data );
-
+
return;
}
}
#endif // wxUSE_TOOLTIPS
-void wxListBox::GtkDisableEvents()
-{
- GList *child = m_list->children;
- while (child)
- {
- gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
-
- if (HasFlag(wxLB_MULTIPLE))
- gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
- GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
-
- child = child->next;
- }
-}
-
-void wxListBox::GtkEnableEvents()
-{
- GList *child = m_list->children;
- while (child)
- {
- gtk_signal_connect( GTK_OBJECT(child->data), "select",
- GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
-
- if (HasFlag(wxLB_MULTIPLE))
- gtk_signal_connect( GTK_OBJECT(child->data), "deselect",
- GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
-
- child = child->next;
- }
-}
-
GtkWidget *wxListBox::GetConnectWidget()
{
return GTK_WIDGET(m_list);
wxSize wxListBox::DoGetBestSize() const
{
- return wxSize(100, 110);
+ int lbWidth = 100; // some defaults
+ int lbHeight = 110;
+ int wLine;
+
+ // Find the widest line
+ for(int i = 0; i < GetCount(); i++) {
+ wxString str(GetString(i));
+ GetTextExtent(str, &wLine, NULL);
+ lbWidth = wxMax(lbWidth, wLine);
+ }
+
+ // Add room for the scrollbar
+ lbWidth += wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+
+ // And just a bit more
+ int cx, cy;
+ GetTextExtent("X", &cx, &cy);
+ lbWidth += 3 * cx;
+
+ // 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(GetCount(), 3), 10);
+
+ return wxSize(lbWidth, lbHeight);
}
#endif
projects / wxWidgets.git / blobdiff