X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7a11f8c8e665992e2d1956b2b89d2f562c92669..5955710c8bd346e8be675bd1dbbd427723a57920:/src/gtk1/listbox.cpp diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index d09bb14fa3..a8a680a940 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -8,30 +8,33 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "listbox.h" #endif -#include "wx/listbox.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/defs.h" #if wxUSE_LISTBOX +#include "wx/listbox.h" #include "wx/dynarray.h" +#include "wx/arrstr.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/checklst.h" #include "wx/settings.h" +#include "wx/gtk/private.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" #endif -#if wxUSE_DRAG_AND_DROP -#include "wx/dnd.h" -#endif - -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include +#include //----------------------------------------------------------------------------- // idle system @@ -40,43 +43,49 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; -//------------------------------------------------------------------------- -// conditional compilation -//------------------------------------------------------------------------- - -#if (GTK_MINOR_VERSION > 0) - #define NEW_GTK_SCROLL_CODE -#endif - //----------------------------------------------------------------------------- -// private functions +// data //----------------------------------------------------------------------------- -#if wxUSE_CHECKLISTBOX +extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnScroll; +extern wxCursor g_globalCursor; +extern wxWindowGTK *g_delayedFocus; -#define CHECKBOX_STRING "[-] " +static bool g_hasDoubleClicked = FALSE; -// checklistboxes have "[±] " prepended to their lables, this macro removes it -// (NB: 4 below is the length of CHECKBOX_STRING above) -// -// the argument to it is a "const char *" pointer -#define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label)) +//----------------------------------------------------------------------------- +// idle callback for SetFirstItem +//----------------------------------------------------------------------------- -#else // !wxUSE_CHECKLISTBOX +struct wxlistbox_idle_struct +{ + wxListBox *m_listbox; + int m_item; + gint m_tag; +}; -#define GET_REAL_LABEL(label) (label) +extern "C" gint wxlistbox_idle_callback( gpointer gdata ) +{ + wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata; + gdk_threads_enter(); -#endif // wxUSE_CHECKLISTBOX + gtk_idle_remove( data->m_tag ); -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- + // check that the items haven't been deleted from the listbox since we had + // installed this callback + wxListBox *lbox = data->m_listbox; + if ( data->m_item < lbox->GetCount() ) + { + lbox->SetFirstItem( data->m_item ); + } -extern bool g_blockEventsOnDrag; -extern bool g_blockEventsOnScroll; -extern wxCursor g_globalCursor; + delete data; -static bool g_hasDoubleClicked = FALSE; + gdk_threads_leave(); + + return TRUE; +} //----------------------------------------------------------------------------- // "button_release_event" @@ -102,25 +111,28 @@ gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget), if (!g_hasDoubleClicked) return FALSE; - wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); - event.SetEventObject( listbox ); + wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); + event.SetEventObject( listbox ); - wxArrayInt aSelections; - int count = listbox->GetSelections(aSelections); - if ( count > 0 ) - { - event.m_commandInt = aSelections[0] ; - event.m_clientData = listbox->GetClientData( event.m_commandInt ); - wxString str(listbox->GetString(event.m_commandInt)); - if (!str.IsEmpty()) event.m_commandString = str; - } - else - { - event.m_commandInt = -1 ; - event.m_commandString.Empty(); - } + wxArrayInt aSelections; + int n, count = listbox->GetSelections(aSelections); + if ( count > 0 ) + { + n = aSelections[0]; + if ( listbox->HasClientObjectData() ) + event.SetClientObject( listbox->GetClientObject(n) ); + else if ( listbox->HasClientUntypedData() ) + event.SetClientData( listbox->GetClientData(n) ); + event.SetString( listbox->GetString(n) ); + } + else + { + n = -1; + } - listbox->GetEventHandler()->ProcessEvent( event ); + event.m_commandInt = n; + + listbox->GetEventHandler()->ProcessEvent( event ); return FALSE; } @@ -141,7 +153,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget, if (!listbox->m_hasVMT) return FALSE; - int sel = listbox->GetIndex( widget ); + int sel = listbox->GtkGetIndex( widget ); #if wxUSE_CHECKLISTBOX if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS)) @@ -167,70 +179,122 @@ gtk_listbox_button_press_callback( GtkWidget *widget, // "key_press_event" //----------------------------------------------------------------------------- -#if wxUSE_CHECKLISTBOX static gint gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox ) { - if (g_isIdle) wxapp_install_idle_handler(); + if (g_isIdle) + wxapp_install_idle_handler(); - if (g_blockEventsOnDrag) return FALSE; + if (g_blockEventsOnDrag) + return FALSE; - if (!listbox->m_hasVMT) return FALSE; + bool ret = FALSE; - if (gdk_event->keyval != ' ') return FALSE; + if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) + { + wxNavigationKeyEvent new_event; + /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */ + new_event.SetDirection( (gdk_event->keyval == GDK_Tab) ); + /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */ + new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) ); + new_event.SetCurrentFocus( listbox ); + ret = listbox->GetEventHandler()->ProcessEvent( new_event ); + } - int sel = listbox->GetIndex( widget ); + if ((gdk_event->keyval == GDK_Return) && (!ret)) + { + // eat return in all modes + ret = TRUE; + } - wxCheckListBox *clb = (wxCheckListBox *)listbox; +#if wxUSE_CHECKLISTBOX + if ((gdk_event->keyval == ' ') && (listbox->m_hasCheckBoxes) && (!ret)) + { + int sel = listbox->GtkGetIndex( widget ); - clb->Check( sel, !clb->IsChecked(sel) ); + wxCheckListBox *clb = (wxCheckListBox *)listbox; - wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); - event.SetEventObject( listbox ); - event.SetInt( sel ); - listbox->GetEventHandler()->ProcessEvent( event ); + clb->Check( sel, !clb->IsChecked(sel) ); + + wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); + new_event.SetEventObject( listbox ); + new_event.SetInt( sel ); + ret = listbox->GetEventHandler()->ProcessEvent( new_event ); + } +#endif // wxUSE_CHECKLISTBOX + + if (ret) + { + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + return TRUE; + } return FALSE; } -#endif // wxUSE_CHECKLISTBOX //----------------------------------------------------------------------------- // "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 ); + + // indicate whether this is a selection or a deselection + event.SetExtraLong( 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 count = listbox->GetSelections(aSelections); + int n, count = listbox->GetSelections(aSelections); if ( count > 0 ) { - event.m_commandInt = aSelections[0] ; - event.m_clientData = listbox->GetClientData( event.m_commandInt ); - wxString str(listbox->GetString(event.m_commandInt)); - if (!str.IsEmpty()) event.m_commandString = str; + n = aSelections[0]; + if ( listbox->HasClientObjectData() ) + event.SetClientObject( listbox->GetClientObject(n) ); + else if ( listbox->HasClientUntypedData() ) + event.SetClientData( listbox->GetClientData(n) ); + event.SetString( listbox->GetString(n) ); } else { - event.m_commandInt = -1 ; - event.m_commandString.Empty(); + n = -1; } - event.SetEventObject( listbox ); + event.m_commandInt = n; +// No longer required with new code in wxLB_SINGLE +// listbox->GetEventHandler()->AddPendingEvent( event ); listbox->GetEventHandler()->ProcessEvent( event ); } @@ -240,6 +304,10 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) +// ---------------------------------------------------------------------------- +// construction +// ---------------------------------------------------------------------------- + wxListBox::wxListBox() { m_list = (GtkList *) NULL; @@ -251,16 +319,19 @@ wxListBox::wxListBox() bool wxListBox::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int n, const wxString choices[], - long style, const wxValidator& validator, const wxString &name ) + long style, const wxValidator& validator, + const wxString &name ) { m_needParent = TRUE; m_acceptsFocus = TRUE; + m_prevSelection = 0; // or -1 ?? + m_blockEvent = FALSE; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { - wxFAIL_MSG( T("wxListBox creation failed") ); - return FALSE; + wxFAIL_MSG( wxT("wxListBox creation failed") ); + return FALSE; } m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); @@ -277,85 +348,58 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, 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 ); -#ifdef NEW_GTK_SCROLL_CODE gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), GTK_WIDGET(m_list) ); -#else - gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) ); -#endif + + /* make list scroll when moving the focus down using cursor keys */ + gtk_container_set_focus_vadjustment( + GTK_CONTAINER(m_list), + gtk_scrolled_window_get_vadjustment( + GTK_SCROLLED_WINDOW(m_widget))); gtk_widget_show( GTK_WIDGET(m_list) ); - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 100; - if (newSize.y == -1) newSize.y = 110; - SetSize( newSize.x, newSize.y ); + if ( style & wxLB_SORT ) + { + // this will change DoAppend() behaviour + m_strings = new wxSortedArrayString; + } + else + { + m_strings = (wxSortedArrayString *)NULL; + } for (int i = 0; i < n; i++) { - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) NULL ); - - GtkWidget *list_item; - - wxString str(choices[i]); -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - { - str.Prepend(CHECKBOX_STRING); - } -#endif // wxUSE_CHECKLISTBOX - - list_item = gtk_list_item_new_with_label( str.mbc_str() ); - - gtk_container_add( GTK_CONTAINER(m_list), list_item ); - - gtk_signal_connect( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - - if (style & wxLB_MULTIPLE) - gtk_signal_connect( GTK_OBJECT(list_item), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(list_item), - "button_press_event", - (GtkSignalFunc)gtk_listbox_button_press_callback, - (gpointer) this ); - - gtk_signal_connect_after( GTK_OBJECT(list_item), - "button_release_event", - (GtkSignalFunc)gtk_listbox_button_release_callback, - (gpointer) this ); - -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - { - gtk_signal_connect( GTK_OBJECT(list_item), - "key_press_event", - (GtkSignalFunc)gtk_listbox_key_press_callback, - (gpointer)this ); - } -#endif // wxUSE_CHECKLISTBOX - - ConnectWidget( list_item ); - - gtk_widget_show( list_item ); + // add one by one + 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(); - - SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) ); - SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); + InheritAttributes(); Show( TRUE ); @@ -364,114 +408,114 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, wxListBox::~wxListBox() { + m_hasVMT = FALSE; + Clear(); + + if (m_strings) + delete m_strings; } -void wxListBox::InsertItems(int nItems, const wxString items[], int pos) +// ---------------------------------------------------------------------------- +// adding items +// ---------------------------------------------------------------------------- + +void wxListBox::DoInsertItems(const wxArrayString& items, int pos) { - wxCHECK_RET( m_list != NULL, T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + + // VZ: notice that InsertItems knows nothing about sorting, so calling it + // from outside (and not from our own Append) is likely to break + // everything + + // code elsewhere supposes we have as many items in m_clientList as items + // in the listbox + wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(), + wxT("bug in client data management") ); GList *children = m_list->children; int length = g_list_length(children); - wxCHECK_RET( pos <= length, T("invalid index in wxListBox::InsertItems") ); - // VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item - // into a listbox at the given position, this is why we first delete - // all items after this position, then append these items and then - // reappend back the old ones. + wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") ); - // first detach the old items - int n; // loop var + size_t nItems = items.GetCount(); + int index; - if ( pos == length ) + if (m_strings) { - // no need to do anything complicated - for ( n = 0; n < nItems; n++ ) + for (size_t n = 0; n < nItems; n++) { - Append(items[n]); - } + index = m_strings->Add( items[n] ); - return; + if (index != GetCount()) + { + GtkAddItem( items[n], index ); + wxList::compatibility_iterator node = m_clientList.Item( index ); + m_clientList.Insert( node, (wxObject*) NULL ); + } + else + { + GtkAddItem( items[n] ); + m_clientList.Append( (wxObject*) NULL ); + } + } } - - wxArrayString deletedLabels; - wxArrayPtrVoid deletedData; - wxArrayInt deletedChecks; // only for check list boxes - - GList *child = g_list_nth( children, pos ); - for ( n = 0; child != NULL; n++, child = child->next ) + else { - // save label - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str(GET_REAL_LABEL(label->label),*wxConvCurrent); - deletedLabels.Add(str); - - // save data - void *clientData = NULL; - wxNode *node = NULL; - - if ( n < (int)m_clientObjectList.GetCount() ) - node = m_clientObjectList.Nth( n ); - - if ( node ) - { - clientData = node->GetData(); - m_clientObjectList.DeleteNode( node ); - } - - if ( !clientData ) + if (pos == length) { - if ( n < (int)m_clientDataList.GetCount() ) - node = m_clientDataList.Nth( n ); - - if ( node ) + for ( size_t n = 0; n < nItems; n++ ) { - clientData = node->GetData(); - node = m_clientDataList.Nth( n ); + GtkAddItem( items[n] ); + + m_clientList.Append((wxObject *)NULL); } } - - deletedData.Add(clientData); - -#if wxUSE_CHECKLISTBOX - // save check state - if ( m_hasCheckBoxes ) + else { - deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n)); + wxList::compatibility_iterator node = m_clientList.Item( pos ); + for ( size_t n = 0; n < nItems; n++ ) + { + GtkAddItem( items[n], pos+n ); + + m_clientList.Insert( node, (wxObject *)NULL ); + } } -#endif // wxUSE_CHECKLISTBOX } - int nDeletedCount = n; - - gtk_list_clear_items( m_list, pos, length ); - - // now append the new items - for ( n = 0; n < nItems; n++ ) - { - Append(items[n]); - } + wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(), + wxT("bug in client data management") ); +} - // and append the old items too - pos += nItems; // now the indices are shifter - for ( n = 0; n < nDeletedCount; n++ ) +int wxListBox::DoAppend( const wxString& item ) +{ + if (m_strings) { - Append(deletedLabels[n], deletedData[n]); + // need to determine the index + int index = m_strings->Add( item ); -#if wxUSE_CHECKLISTBOX - if ( m_hasCheckBoxes ) + // only if not at the end anyway + if (index != GetCount()) { - ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]); + GtkAddItem( item, index ); + + wxList::compatibility_iterator node = m_clientList.Item( index ); + m_clientList.Insert( node, (wxObject *)NULL ); + + return index; } -#endif // wxUSE_CHECKLISTBOX } + + GtkAddItem(item); + + m_clientList.Append((wxObject *)NULL); + + return GetCount() - 1; } -void wxListBox::AppendCommon( const wxString &item ) +void wxListBox::GtkAddItem( const wxString &item, int pos ) { - wxCHECK_RET( m_list != NULL, T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); GtkWidget *list_item; @@ -479,18 +523,24 @@ void wxListBox::AppendCommon( const wxString &item ) #if wxUSE_CHECKLISTBOX if (m_hasCheckBoxes) { - label.Prepend(CHECKBOX_STRING); + label.Prepend(wxCHECKLBOX_STRING); } #endif // wxUSE_CHECKLISTBOX - list_item = gtk_list_item_new_with_label( label.mbc_str() ); + list_item = gtk_list_item_new_with_label( wxGTK_CONV( label ) ); + + GList *gitem_list = g_list_alloc (); + gitem_list->data = list_item; - gtk_container_add( GTK_CONTAINER(m_list), list_item ); + if (pos == -1) + gtk_list_append_items( GTK_LIST (m_list), gitem_list ); + else + gtk_list_insert_items( GTK_LIST (m_list), gitem_list, pos ); 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 ); @@ -504,197 +554,264 @@ void wxListBox::AppendCommon( const wxString &item ) (GtkSignalFunc)gtk_listbox_button_release_callback, (gpointer) this ); -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - { - gtk_signal_connect( GTK_OBJECT(list_item), + gtk_signal_connect( GTK_OBJECT(list_item), "key_press_event", (GtkSignalFunc)gtk_listbox_key_press_callback, (gpointer)this ); - } -#endif // wxUSE_CHECKLISTBOX - - gtk_widget_show( list_item ); ConnectWidget( list_item ); + gtk_widget_show( list_item ); + if (GTK_WIDGET_REALIZED(m_widget)) { gtk_widget_realize( list_item ); gtk_widget_realize( GTK_BIN(list_item)->child ); - //if (m_widgetStyle) ApplyWidgetStyle(); - if (m_widgetStyle) { - // Apply current widget style to the new list_item + // Apply current widget style to the new list_item + if (m_widgetStyle) + { gtk_widget_set_style( GTK_WIDGET( list_item ), m_widgetStyle ); GtkBin *bin = GTK_BIN( list_item ); GtkWidget *label = GTK_WIDGET( bin->child ); gtk_widget_set_style( label, m_widgetStyle ); } -#if wxUSE_DRAG_AND_DROP -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) m_dropTarget->RegisterWidget( list_item ); -#endif -#endif - #if wxUSE_TOOLTIPS if (m_tooltip) m_tooltip->Apply( this ); #endif } } -void wxListBox::Append( const wxString &item ) +void wxListBox::DoSetItems( const wxArrayString& items, + void **clientData) { - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) NULL ); + Clear(); - AppendCommon( item ); + DoInsertItems(items, 0); + + if ( clientData ) + { + size_t count = items.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + SetClientData(n, clientData[n]); + } + } } -void wxListBox::Append( const wxString &item, void *clientData ) +// ---------------------------------------------------------------------------- +// deleting items +// ---------------------------------------------------------------------------- + +void wxListBox::Clear() { - m_clientDataList.Append( (wxObject*) clientData ); - m_clientObjectList.Append( (wxObject*) NULL ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + + 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() ) + { + // destroy the data (due to Robert's idea of using wxList + // and not wxList we can't just say + // m_clientList.DeleteContents(TRUE) - this would crash! + wxList::compatibility_iterator node = m_clientList.GetFirst(); + while ( node ) + { + delete (wxClientData *)node->GetData(); + node = node->GetNext(); + } + } + m_clientList.Clear(); - AppendCommon( item ); + if ( m_strings ) + m_strings->Clear(); } -void wxListBox::Append( const wxString &item, wxClientData *clientData ) +void wxListBox::Delete( int n ) { - m_clientObjectList.Append( (wxObject*) clientData ); - m_clientDataList.Append( (wxObject*) NULL ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); + + GList *child = g_list_nth( m_list->children, n ); + + wxCHECK_RET( child, wxT("wrong listbox index") ); + + GList *list = g_list_append( (GList*) NULL, child->data ); + gtk_list_remove_items( m_list, list ); + g_list_free( list ); + + wxList::compatibility_iterator node = m_clientList.Item( n ); + if ( node ) + { + if ( m_clientDataItemsType == wxClientData_Object ) + { + wxClientData *cd = (wxClientData*)node->GetData(); + delete cd; + } - AppendCommon( item ); + m_clientList.Erase( node ); + } + + if ( m_strings ) + m_strings->RemoveAt(n); } -void wxListBox::SetClientData( int n, void* clientData ) +// ---------------------------------------------------------------------------- +// client data +// ---------------------------------------------------------------------------- + +void wxListBox::DoSetItemClientData( int n, void* clientData ) { - wxCHECK_RET( m_widget != NULL, T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return; + wxList::compatibility_iterator node = m_clientList.Item( n ); + wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") ); node->SetData( (wxObject*) clientData ); } -void* wxListBox::GetClientData( int n ) +void* wxListBox::DoGetItemClientData( int n ) const { - wxCHECK_MSG( m_widget != NULL, NULL, T("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") ); - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return NULL; + wxList::compatibility_iterator node = m_clientList.Item( n ); + wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") ); - return node->Data(); + return node->GetData(); } -void wxListBox::SetClientObject( int n, wxClientData* clientData ) +void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData ) { - wxCHECK_RET( m_widget != NULL, T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); - wxNode *node = m_clientObjectList.Nth( n ); - if (!node) return; + wxList::compatibility_iterator node = m_clientList.Item( n ); + wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") ); - wxClientData *cd = (wxClientData*) node->Data(); - if (cd) delete cd; + // wxItemContainer already deletes data for us node->SetData( (wxObject*) clientData ); } -wxClientData* wxListBox::GetClientObject( int n ) +wxClientData* wxListBox::DoGetItemClientObject( int n ) const { - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, T("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") ); - wxNode *node = m_clientObjectList.Nth( n ); - if (!node) return (wxClientData*) NULL; + wxList::compatibility_iterator node = m_clientList.Item( n ); + wxCHECK_MSG( node, (wxClientData *)NULL, + wxT("invalid index in wxListBox::DoGetItemClientObject") ); - return (wxClientData*) node->Data(); + return (wxClientData*) node->GetData(); } -void wxListBox::Clear() +// ---------------------------------------------------------------------------- +// string list access +// ---------------------------------------------------------------------------- + +wxString wxListBox::GetRealLabel(GList *item) const { - wxCHECK_RET( m_list != NULL, T("invalid listbox") ); + GtkBin *bin = GTK_BIN( item->data ); + GtkLabel *label = GTK_LABEL( bin->child ); - gtk_list_clear_items( m_list, 0, Number() ); + wxString str; - wxNode *node = m_clientObjectList.First(); - while (node) - { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - node = node->Next(); - } - m_clientObjectList.Clear(); +#ifdef __WXGTK20__ + str = wxGTK_CONV_BACK( gtk_label_get_text( label ) ); +#else + str = wxString( label->label ); +#endif + +#if wxUSE_CHECKLISTBOX + // checklistboxes have "[±] " prepended to their lables, remove it + // + // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk/checklst.h + if ( m_hasCheckBoxes ) + str.erase(0, 4); +#endif // wxUSE_CHECKLISTBOX - m_clientDataList.Clear(); + return str; } -void wxListBox::Delete( int n ) +void wxListBox::SetString( int n, const wxString &string ) { - wxCHECK_RET( m_list != NULL, T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); GList *child = g_list_nth( m_list->children, n ); + if (child) + { + GtkBin *bin = GTK_BIN( child->data ); + GtkLabel *label = GTK_LABEL( bin->child ); - wxCHECK_RET( child, T("wrong listbox index") ); - - GList *list = g_list_append( (GList*) NULL, child->data ); - gtk_list_remove_items( m_list, list ); - g_list_free( list ); + wxString str; +#if wxUSE_CHECKLISTBOX + if (m_hasCheckBoxes) + str += wxCHECKLBOX_STRING; +#endif // wxUSE_CHECKLISTBOX + str += string; - wxNode *node = m_clientObjectList.Nth( n ); - if (node) - { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - m_clientObjectList.DeleteNode( node ); + gtk_label_set( label, wxGTK_CONV( str ) ); } - - node = m_clientDataList.Nth( n ); - if (node) + else { - m_clientDataList.DeleteNode( node ); + wxFAIL_MSG(wxT("wrong listbox index")); } } -void wxListBox::Deselect( int n ) +wxString wxListBox::GetString( int n ) const { - wxCHECK_RET( m_list != NULL, T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") ); - DisableEvents(); + GList *child = g_list_nth( m_list->children, n ); + if (child) + { + return GetRealLabel(child); + } - gtk_list_unselect_item( m_list, n ); + wxFAIL_MSG(wxT("wrong listbox index")); - EnableEvents(); + return wxT(""); +} + +int wxListBox::GetCount() const +{ + wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); + + GList *children = m_list->children; + return g_list_length(children); } int wxListBox::FindString( const wxString &item ) const { - wxCHECK_MSG( m_list != NULL, -1, T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); GList *child = m_list->children; int count = 0; while (child) { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); - - if (str == item) + if ( GetRealLabel(child) == item ) return count; count++; child = child->next; } - // it's not an error if the string is not found -> no wxCHECK + // it's not an error if the string is not found -> no wxCHECK - return -1; + return wxNOT_FOUND; } +// ---------------------------------------------------------------------------- +// selection +// ---------------------------------------------------------------------------- + int wxListBox::GetSelection() const { - wxCHECK_MSG( m_list != NULL, -1, T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); GList *child = m_list->children; int count = 0; @@ -709,7 +826,7 @@ int wxListBox::GetSelection() const int wxListBox::GetSelections( wxArrayInt& aSelections ) const { - wxCHECK_MSG( m_list != NULL, -1, T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); // get the number of selected items first GList *child = m_list->children; @@ -737,135 +854,78 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const return count; } -wxString wxListBox::GetString( int n ) const -{ - wxCHECK_MSG( m_list != NULL, T(""), T("invalid listbox") ); - - GList *child = g_list_nth( m_list->children, n ); - if (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); - - return str; - } - - wxFAIL_MSG(T("wrong listbox index")); - - return T(""); -} - -wxString wxListBox::GetStringSelection() const -{ - wxCHECK_MSG( m_list != NULL, T(""), T("invalid listbox") ); - - GList *selection = m_list->selection; - if (selection) - { - GtkBin *bin = GTK_BIN( selection->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); - - return str; - } - - wxFAIL_MSG(T("no listbox selection available")); - return T(""); -} - -int wxListBox::Number() -{ - wxCHECK_MSG( m_list != NULL, -1, T("invalid listbox") ); - - GList *child = m_list->children; - int count = 0; - while (child) { count++; child = child->next; } - return count; -} - -bool wxListBox::Selected( int n ) +bool wxListBox::IsSelected( int n ) const { - wxCHECK_MSG( m_list != NULL, FALSE, T("invalid listbox") ); + wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") ); GList *target = g_list_nth( m_list->children, n ); - if (target) - { - GList *child = m_list->selection; - while (child) - { - if (child->data == target->data) return TRUE; - child = child->next; - } - } - wxFAIL_MSG(T("wrong listbox index")); - return FALSE; -} -void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) ) -{ - wxFAIL_MSG(T("wxListBox::Set not implemented")); -} + wxCHECK_MSG( target, FALSE, wxT("invalid listbox index") ); -void wxListBox::SetFirstItem( int WXUNUSED(n) ) -{ - wxFAIL_MSG(T("wxListBox::SetFirstItem not implemented")); -} - -void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) ) -{ - wxFAIL_MSG(T("wxListBox::SetFirstItem not implemented")); + return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ; } void wxListBox::SetSelection( int n, bool select ) { - wxCHECK_RET( m_list != NULL, T("invalid listbox") ); + wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); - DisableEvents(); + 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 ); - EnableEvents(); + m_blockEvent = FALSE; } -void wxListBox::SetString( int n, const wxString &string ) +void wxListBox::DoSetFirstItem( int n ) { - wxCHECK_RET( m_list != NULL, T("invalid listbox") ); + wxCHECK_RET( m_list, wxT("invalid listbox") ); - GList *child = g_list_nth( m_list->children, n ); - if (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); + if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_list)) + return; - wxString str; -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - str += CHECKBOX_STRING; -#endif // wxUSE_CHECKLISTBOX - str += string; + // terribly efficient + const gchar *vadjustment_key = "gtk-vadjustment"; + guint vadjustment_key_id = g_quark_from_static_string (vadjustment_key); - gtk_label_set( label, str.mbc_str() ); - } - else + 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") ); + + if (item->allocation.y == -1) { - wxFAIL_MSG(T("wrong listbox index")); - } -} + 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 ); -void wxListBox::SetStringSelection( const wxString &string, bool select ) -{ - wxCHECK_RET( m_list != NULL, T("invalid listbox") ); + return; + } - SetSelection( FindString(string), select ); + float y = item->allocation.y; + if (y > adjustment->upper - adjustment->page_size) + y = adjustment->upper - adjustment->page_size; + gtk_adjustment_set_value( adjustment, y ); } -int wxListBox::GetIndex( GtkWidget *item ) const +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- + +int wxListBox::GtkGetIndex( GtkWidget *item ) const { if (item) { @@ -893,71 +953,6 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) } #endif // wxUSE_TOOLTIPS -#if wxUSE_DRAG_AND_DROP -void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) -{ - wxCHECK_RET( m_list != NULL, T("invalid listbox") ); - -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) - { - GList *child = m_list->children; - while (child) - { - m_dropTarget->UnregisterWidget( GTK_WIDGET( child->data ) ); - child = child->next; - } - } -#endif - - wxWindow::SetDropTarget( dropTarget ); - -#ifndef NEW_GTK_DND_CODE - if (m_dropTarget) - { - GList *child = m_list->children; - while (child) - { - m_dropTarget->RegisterWidget( GTK_WIDGET( child->data ) ); - child = child->next; - } - } -#endif -} -#endif - -void wxListBox::DisableEvents() -{ - 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::EnableEvents() -{ - 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); @@ -965,7 +960,9 @@ GtkWidget *wxListBox::GetConnectWidget() bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) { - if (wxWindow::IsOwnGtkWindow( window )) return TRUE; + if (m_widget->window == window) return TRUE; + + if (GTK_WIDGET(m_list)->window == window) return TRUE; GList *child = m_list->children; while (child) @@ -1014,28 +1011,75 @@ void wxListBox::OnInternalIdle() if (GTK_WIDGET(m_list)->window && cursor.Ok()) { /* I now set the cursor the anew in every OnInternalIdle call - as setting the cursor in a parent window also effects the - windows above so that checking for the current cursor is - not possible. */ - - gdk_window_set_cursor( GTK_WIDGET(m_list)->window, cursor.GetCursor() ); + as setting the cursor in a parent window also effects the + windows above so that checking for the current cursor is + not possible. */ + + gdk_window_set_cursor( GTK_WIDGET(m_list)->window, cursor.GetCursor() ); GList *child = m_list->children; while (child) { GtkBin *bin = GTK_BIN( child->data ); GtkWidget *label = GTK_WIDGET( bin->child ); - - if (!label->window) - break; - else - gdk_window_set_cursor( label->window, cursor.GetCursor() ); + + if (!label->window) + break; + else + gdk_window_set_cursor( label->window, cursor.GetCursor() ); child = child->next; } } - UpdateWindowUI(); + if (g_delayedFocus == this) + { + if (GTK_WIDGET_REALIZED(m_widget)) + { + gtk_widget_grab_focus( m_widget ); + g_delayedFocus = NULL; + } + } + + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } -#endif +wxSize wxListBox::DoGetBestSize() const +{ + 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::GetMetric(wxSYS_VSCROLL_X); + + // And just a bit more + int cx, cy; + GetTextExtent( wxT("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); +} + +void wxListBox::FixUpMouseEvent(GtkWidget *widget, wxCoord& x, wxCoord& y) +{ + // the mouse event coords are relative to the listbox items, we need to + // translate them to the normal client coords + x += widget->allocation.x; + y += widget->allocation.y; +} + +#endif // wxUSE_LISTBOX +