#include "wx/tooltip.h"
#endif
-# include <gdk/gdk.h>
+#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#if wxUSE_CHECKLISTBOX
-#define CHECKBOX_STRING "[-] "
-
// checklistboxes have "[±] " prepended to their lables, this macro removes it
-// (NB: 4 below is the length of CHECKBOX_STRING above)
+// (NB: 4 below is the length of wxCHECKLBOX_STRING above)
//
// the argument to it is a "const char *" pointer
#define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label))
static bool g_hasDoubleClicked = FALSE;
+//-----------------------------------------------------------------------------
+// idle callback for SetFirstItem
+//-----------------------------------------------------------------------------
+
+struct wxlistbox_idle_struct
+{
+ wxListBox *m_listbox;
+ int m_item;
+ gint m_tag;
+};
+
+static gint wxlistbox_idle_callback( gpointer gdata )
+{
+ wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
+ gdk_threads_enter();
+
+ gtk_idle_remove( data->m_tag );
+
+ data->m_listbox->SetFirstItem( data->m_item );
+
+ delete data;
+
+ gdk_threads_leave();
+
+ return TRUE;
+}
+
//-----------------------------------------------------------------------------
// "button_release_event"
//-----------------------------------------------------------------------------
ret = listbox->GetEventHandler()->ProcessEvent( new_event );
}
+ if ((gdk_event->keyval == GDK_Return) && (!ret))
+ {
+ // eat return in all modes
+ ret = TRUE;
+ }
+
#if wxUSE_CHECKLISTBOX
if ((gdk_event->keyval == ' ') && (listbox->m_hasCheckBoxes) && (!ret))
{
// "select" and "deselect"
//-----------------------------------------------------------------------------
-static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox );
+static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection );
+
+static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox )
+{
+ gtk_listitem_select_cb( widget, listbox, TRUE );
+}
static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
{
- gtk_listitem_select_callback( widget, listbox );
+ gtk_listitem_select_cb( widget, listbox, FALSE );
}
-static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )
+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 );
+
+// 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 ))
m_list = GTK_LIST( gtk_list_new() );
- GtkSelectionMode mode = GTK_SELECTION_BROWSE;
+ GtkSelectionMode mode;
if (style & wxLB_MULTIPLE)
+ {
mode = GTK_SELECTION_MULTIPLE;
+ }
else if (style & wxLB_EXTENDED)
+ {
mode = GTK_SELECTION_EXTENDED;
+ }
+ else
+ {
+ // if style was 0 set single mode
+ m_windowStyle |= wxLB_SINGLE;
+ mode = GTK_SELECTION_MULTIPLE;
+ }
gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
gtk_widget_show( GTK_WIDGET(m_list) );
- SetSizeOrDefault( size );
+ SetBestSize( size );
if ( style & wxLB_SORT )
{
wxListBox::~wxListBox()
{
+ m_hasVMT = FALSE;
+
Clear();
+
if (m_strings)
delete m_strings;
}
wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );
size_t nItems = items.GetCount();
+ int index;
- if (pos == length)
+ if (m_strings)
{
- for ( size_t n = 0; n < nItems; n++ )
+ for (size_t n = 0; n < nItems; n++)
{
- GtkAddItem( items[n] );
-
- m_clientList.Append((wxObject *)NULL);
+ index = m_strings->Add( items[n] );
+
+ if (index != GetCount())
+ {
+ GtkAddItem( items[n], index );
+ wxNode *node = m_clientList.Nth( index );
+ m_clientList.Insert( node, (wxObject*) NULL );
+ }
+ else
+ {
+ GtkAddItem( items[n] );
+ m_clientList.Append( (wxObject*) NULL );
+ }
}
}
else
{
- wxNode *node = m_clientList.Nth( pos );
- for ( size_t n = 0; n < nItems; n++ )
+ if (pos == length)
+ {
+ for ( size_t n = 0; n < nItems; n++ )
+ {
+ GtkAddItem( items[n] );
+
+ m_clientList.Append((wxObject *)NULL);
+ }
+ }
+ else
{
- GtkAddItem( items[n], pos+n );
+ wxNode *node = m_clientList.Nth( pos );
+ for ( size_t n = 0; n < nItems; n++ )
+ {
+ GtkAddItem( items[n], pos+n );
- m_clientList.Insert( node, (wxObject *)NULL );
+ m_clientList.Insert( node, (wxObject *)NULL );
+ }
}
}
#if wxUSE_CHECKLISTBOX
if (m_hasCheckBoxes)
{
- label.Prepend(CHECKBOX_STRING);
+ label.Prepend(wxCHECKLBOX_STRING);
}
#endif // wxUSE_CHECKLISTBOX
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() )
{
wxNode *node = m_clientList.Nth( n );
if ( node )
{
- if ( m_clientDataItemsType == ClientData_Object )
+ if ( m_clientDataItemsType == wxClientData_Object )
{
wxClientData *cd = (wxClientData*)node->Data();
delete cd;
wxString str;
#if wxUSE_CHECKLISTBOX
if (m_hasCheckBoxes)
- str += CHECKBOX_STRING;
+ str += wxCHECKLBOX_STRING;
#endif // wxUSE_CHECKLISTBOX
str += string;
{
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 )
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") );
- // find the last item before this one which is already realized
- size_t nItemsBefore;
- for ( nItemsBefore = 0; item && (item->allocation.y == -1); nItemsBefore++ )
+ if (item->allocation.y == -1)
{
- target = target->prev;
- if ( !target )
- {
- // nothing we can do if there are no allocated items yet
- return;
- }
+ wxlistbox_idle_struct* data = new wxlistbox_idle_struct;
+ data->m_listbox = this;
+ data->m_item = n;
+ data->m_tag = gtk_idle_add_priority( 800, wxlistbox_idle_callback, (gpointer) data );
- item = GTK_WIDGET(target->data);
+ return;
}
- gtk_adjustment_set_value(adjustment,
- item->allocation.y +
- nItemsBefore*item->allocation.height);
+ float y = item->allocation.y;
+ if (y > adjustment->upper - adjustment->page_size)
+ y = adjustment->upper - adjustment->page_size;
+ gtk_adjustment_set_value( adjustment, y );
}
// ----------------------------------------------------------------------------
}
#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