X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ee3ee1bc8ac2f95029835ebc115fac0a1fbd02a..bcd3d8d9e26e41615d26d457ba0e2b84b80a0356:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index c09dca4977..9339a6dedf 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -26,12 +26,9 @@ #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 @@ -54,10 +51,8 @@ extern bool g_isIdle; #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)) @@ -78,6 +73,33 @@ extern wxCursor g_globalCursor; 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" //----------------------------------------------------------------------------- @@ -102,25 +124,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 +166,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,45 +192,76 @@ 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 == 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 ); + } - if (gdk_event->keyval != ' ') return FALSE; + 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)) + { + int sel = listbox->GtkGetIndex( widget ); - int sel = listbox->GetIndex( widget ); + wxCheckListBox *clb = (wxCheckListBox *)listbox; - wxCheckListBox *clb = (wxCheckListBox *)listbox; + clb->Check( sel, !clb->IsChecked(sel) ); - 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 - wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); - event.SetEventObject( listbox ); - event.SetInt( sel ); - listbox->GetEventHandler()->ProcessEvent( event ); + 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(); @@ -213,14 +269,31 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox if (g_blockEventsOnDrag) 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); if ( count > 0 ) { n = aSelections[0]; - event.m_clientData = listbox->m_clientData.Item(n); - event.m_commandString = listbox->GetString(n); + if ( listbox->HasClientObjectData() ) + event.SetClientObject( listbox->GetClientObject(n) ); + else if ( listbox->HasClientUntypedData() ) + event.SetClientData( listbox->GetClientData(n) ); + event.SetString( listbox->GetString(n) ); } else { @@ -229,8 +302,8 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox event.m_commandInt = n; - event.SetEventObject( listbox ); - +// No longer required with new code in wxLB_SINGLE +// listbox->GetEventHandler()->AddPendingEvent( event ); listbox->GetEventHandler()->ProcessEvent( event ); } @@ -260,6 +333,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, { m_needParent = TRUE; m_acceptsFocus = TRUE; + m_prevSelection = 0; // or -1 ?? if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) @@ -282,11 +356,21 @@ 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 ); @@ -304,75 +388,29 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, 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 ); + SetBestSize( size ); 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_clientData.Append((wxObject *)NULL); - + // add one by one DoAppend(choices[i]); - -#if 0 - wxString str(choices[i]); - -#if wxUSE_CHECKLISTBOX - if (m_hasCheckBoxes) - { - str.Prepend(CHECKBOX_STRING); - } -#endif // wxUSE_CHECKLISTBOX - - GtkWidget *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 ); -#endif // 0 } m_parent->DoAddChild( this ); PostCreation(); - SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) ); + SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) ); SetForegroundColour( parent->GetForegroundColour() ); SetFont( parent->GetFont() ); @@ -383,145 +421,108 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, wxListBox::~wxListBox() { + m_hasVMT = FALSE; + Clear(); + + if (m_strings) + delete m_strings; } void wxListBox::DoInsertItems(const wxArrayString& items, int pos) { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); - // code elsewhere supposes we have as many items in m_clientData as items + // 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_clientData.GetCount() == (size_t)GetCount(), + 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, wxT("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. - // VZ: notice that InsertItems knows nothing about sorting, so calling it - // from outside (and not from our own Append) is likely to break - // everything + wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") ); size_t nItems = items.GetCount(); + int index; - size_t n; // loop var - - // optimise for this trivial case - 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++) { - AppendWithoutSorting(items[n]); - - m_clientData.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 ); + } } - - wxASSERT_MSG( m_clientData.GetCount() == (size_t)GetCount(), - wxT("bug in client data management") ); - - return; } - - // remove the old items - wxArrayString deletedLabels; - wxArrayPtrVoid deletedData; -#if wxUSE_CHECKLISTBOX - wxArrayInt deletedChecks; -#endif - - 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 - deletedData.Add(m_clientData.Item(n)); - -#if wxUSE_CHECKLISTBOX - // save check state - if ( m_hasCheckBoxes ) + if (pos == length) { - deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n)); - } -#endif // wxUSE_CHECKLISTBOX - } + for ( size_t n = 0; n < nItems; n++ ) + { + GtkAddItem( items[n] ); - // don't delete contents, the data will be reappended soon - m_clientData.Clear(); - - size_t nDeletedCount = n; - - gtk_list_clear_items( m_list, pos, length ); - - // now append the new items - for ( n = 0; n < nItems; n++ ) - { - AppendWithoutSorting(items[n]); - - m_clientData.Append((wxObject *)NULL); - } - - // and append the old items too - pos += nItems; // now the indices are shifter - for ( n = 0; n < nDeletedCount; n++ ) - { - AppendWithoutSorting(deletedLabels[n]); - - m_clientData.Append((wxObject *)NULL); - - if ( m_clientDataItemsType == ClientData_Object ) - SetClientObject(n, (wxClientData *)deletedData[n]); - else if ( m_clientDataItemsType == ClientData_Void ) - SetClientData(n, deletedData[n]); - -#if wxUSE_CHECKLISTBOX - if ( m_hasCheckBoxes ) + m_clientList.Append((wxObject *)NULL); + } + } + else { - ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[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 ); + } } -#endif // wxUSE_CHECKLISTBOX } - wxASSERT_MSG( m_clientData.GetCount() == (size_t)GetCount(), - wxT("bug in client data management") ); + wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(), + wxT("bug in client data management") ); } int wxListBox::DoAppend( const wxString& item ) { - int index; - if ( m_strings ) + if (m_strings) { // need to determine the index - index = m_strings->Add(item); + int index = m_strings->Add( item ); - InsertItems(1, &item, index); - } - else - { - // not sorted, just append - AppendWithoutSorting(item); + // only if not at the end anyway + if (index != GetCount()) + { + GtkAddItem( item, index ); - m_clientData.Append((wxObject *)NULL); + wxNode *node = m_clientList.Nth( index ); + m_clientList.Insert( node, (wxObject *)NULL ); - index = GetCount() - 1; + return index; + } } - return index; + GtkAddItem(item); + + m_clientList.Append((wxObject *)NULL); + + return GetCount() - 1; } -void wxListBox::AppendWithoutSorting( const wxString &item ) +void wxListBox::GtkAddItem( const wxString &item, int pos ) { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); @@ -531,18 +532,24 @@ void wxListBox::AppendWithoutSorting( 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() ); - gtk_container_add( GTK_CONTAINER(m_list), list_item ); + GList *gitem_list = g_list_alloc (); + gitem_list->data = 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 ); @@ -556,40 +563,29 @@ void wxListBox::AppendWithoutSorting( 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 @@ -617,32 +613,32 @@ void wxListBox::DoSetItems( const wxArrayString& items, // client data // ---------------------------------------------------------------------------- -void wxListBox::DoSetClientData( int n, void* clientData ) +void wxListBox::DoSetItemClientData( int n, void* clientData ) { wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); - wxNode *node = m_clientData.Nth( n ); - wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetClientData") ); + wxNode *node = m_clientList.Nth( n ); + wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") ); node->SetData( (wxObject*) clientData ); } -void* wxListBox::DoGetClientData( int n ) const +void* wxListBox::DoGetItemClientData( int n ) const { wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") ); - wxNode *node = m_clientData.Nth( n ); - wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetClientData") ); + wxNode *node = m_clientList.Nth( n ); + wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") ); return node->Data(); } -void wxListBox::DoSetClientObject( int n, wxClientData* clientData ) +void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData ) { wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") ); - wxNode *node = m_clientData.Nth( n ); - wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetClientObject") ); + wxNode *node = m_clientList.Nth( n ); + wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") ); wxClientData *cd = (wxClientData*) node->Data(); delete cd; @@ -650,13 +646,13 @@ void wxListBox::DoSetClientObject( int n, wxClientData* clientData ) node->SetData( (wxObject*) clientData ); } -wxClientData* wxListBox::DoGetClientObject( int n ) const +wxClientData* wxListBox::DoGetItemClientObject( int n ) const { wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") ); - wxNode *node = m_clientData.Nth( n ); + wxNode *node = m_clientList.Nth( n ); wxCHECK_MSG( node, (wxClientData *)NULL, - wxT("invalid index in wxListBox::DoGetClientObject") ); + wxT("invalid index in wxListBox::DoGetItemClientObject") ); return (wxClientData*) node->Data(); } @@ -665,11 +661,21 @@ void wxListBox::Clear() { 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 ( m_clientDataItemsType == ClientData_Object ) - m_clientData.DeleteContents(TRUE); - m_clientData.Clear(); + 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! + wxNode *node = m_clientList.First(); + while ( node ) + { + delete (wxClientData *)node->Data(); + node = node->Next(); + } + } + m_clientList.Clear(); if ( m_strings ) m_strings->Clear(); @@ -687,16 +693,16 @@ void wxListBox::Delete( int n ) gtk_list_remove_items( m_list, list ); g_list_free( list ); - wxNode *node = m_clientData.Nth( n ); + 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; } - m_clientData.DeleteNode( node ); + m_clientList.DeleteNode( node ); } if ( m_strings ) @@ -720,7 +726,7 @@ void wxListBox::SetString( int n, const wxString &string ) wxString str; #if wxUSE_CHECKLISTBOX if (m_hasCheckBoxes) - str += CHECKBOX_STRING; + str += wxCHECKLBOX_STRING; #endif // wxUSE_CHECKLISTBOX str += string; @@ -756,15 +762,8 @@ int wxListBox::GetCount() const { wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") ); - GList *child = m_list->children; - int count = 0; - while (child) - { - count++; - child = child->next; - } - - return count; + GList *children = m_list->children; + return g_list_length(children); } int wxListBox::FindString( const wxString &item ) const @@ -846,45 +845,73 @@ bool wxListBox::IsSelected( int n ) const 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(wxT("wrong listbox index")); + wxCHECK_MSG( target, FALSE, wxT("invalid listbox index") ); - return FALSE; + return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ; } void wxListBox::SetSelection( int n, bool select ) { wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); - DisableEvents(); + GtkDisableEvents(); 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(); + GtkEnableEvents(); } -void wxListBox::DoSetFirstItem( int WXUNUSED(n) ) +void wxListBox::DoSetFirstItem( int n ) { - wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented")); + wxCHECK_RET( m_list, wxT("invalid listbox") ); + + if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_list)) + return; + + // terribly efficient + const gchar *vadjustment_key = "gtk-vadjustment"; + guint vadjustment_key_id = g_quark_from_static_string (vadjustment_key); + + 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) + { + 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 ); + + return; + } + + float y = item->allocation.y; + if (y > adjustment->upper - adjustment->page_size) + y = adjustment->upper - adjustment->page_size; + gtk_adjustment_set_value( adjustment, y ); } // ---------------------------------------------------------------------------- // helpers // ---------------------------------------------------------------------------- -int wxListBox::GetIndex( GtkWidget *item ) const +int wxListBox::GtkGetIndex( GtkWidget *item ) const { if (item) { @@ -912,40 +939,7 @@ 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, wxT("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() +void wxListBox::GtkDisableEvents() { GList *child = m_list->children; while (child) @@ -953,7 +947,7 @@ void wxListBox::DisableEvents() gtk_signal_disconnect_by_func( GTK_OBJECT(child->data), GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - if (HasFlag(wxLB_MULTIPLE)) + if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED)) gtk_signal_disconnect_by_func( GTK_OBJECT(child->data), GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); @@ -961,7 +955,7 @@ void wxListBox::DisableEvents() } } -void wxListBox::EnableEvents() +void wxListBox::GtkEnableEvents() { GList *child = m_list->children; while (child) @@ -969,7 +963,7 @@ void wxListBox::EnableEvents() gtk_signal_connect( GTK_OBJECT(child->data), "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(child->data), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this ); @@ -984,7 +978,7 @@ GtkWidget *wxListBox::GetConnectWidget() bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) { - if (wxWindow::IsOwnGtkWindow( window )) return TRUE; + if (GTK_WIDGET(m_list)->window == window) return TRUE; GList *child = m_list->children; while (child) @@ -1036,7 +1030,7 @@ void wxListBox::OnInternalIdle() 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; @@ -1044,7 +1038,7 @@ void wxListBox::OnInternalIdle() { GtkBin *bin = GTK_BIN( child->data ); GtkWidget *label = GTK_WIDGET( bin->child ); - + if (!label->window) break; else @@ -1057,4 +1051,9 @@ void wxListBox::OnInternalIdle() UpdateWindowUI(); } +wxSize wxListBox::DoGetBestSize() const +{ + return wxSize(100, 110); +} + #endif