From dcf40a56e7b09fc5472edc1d4471e7954c0da40d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 22 Sep 1998 14:40:18 +0000 Subject: [PATCH] wxListBox::FindString(): it's not an error if the string is not found, so don't give assert failures in this case. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/listbox.cpp | 116 ++++++++++++++++++++++--------------------- src/gtk1/listbox.cpp | 116 ++++++++++++++++++++++--------------------- 2 files changed, 120 insertions(+), 112 deletions(-) diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 4732b2814d..d434764ba4 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -32,9 +32,9 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox { if (!listbox->HasVMT()) return; if (g_blockEventsOnDrag) return; - + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); - + wxArrayInt aSelections; int count = listbox->GetSelections(aSelections); if ( count > 0 ) @@ -68,23 +68,23 @@ wxListBox::wxListBox(void) m_list = (GtkList *) NULL; } -bool wxListBox::Create( wxWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, +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 ) { m_needParent = TRUE; - + PreCreation( parent, id, pos, size, style, name ); - + SetValidator( validator ); m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); - + m_list = GTK_LIST( gtk_list_new() ); - + GtkSelectionMode mode = GTK_SELECTION_BROWSE; if (style & wxLB_MULTIPLE) mode = GTK_SELECTION_MULTIPLE; @@ -92,40 +92,40 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, mode = GTK_SELECTION_EXTENDED; gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); - + gtk_container_add (GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) ); 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 ); - + for (int i = 0; i < n; i++) { GtkWidget *list_item; - list_item = gtk_list_item_new_with_label( choices[i] ); - + list_item = gtk_list_item_new_with_label( choices[i] ); + gtk_container_add( GTK_CONTAINER(m_list), list_item ); - - gtk_signal_connect( GTK_OBJECT(list_item), "select", + + 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_connect( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - + m_clientData.Append( (wxObject*)NULL ); - + gtk_widget_show( list_item ); } - + PostCreation(); - + gtk_widget_realize( GTK_WIDGET(m_list) ); - + Show( TRUE ); - + return TRUE; } @@ -136,56 +136,56 @@ void wxListBox::Append( const wxString &item ) void wxListBox::Append( const wxString &item, char *clientData ) { - GtkWidget *list_item = gtk_list_item_new_with_label( item ); - + GtkWidget *list_item = gtk_list_item_new_with_label( item ); + if (m_hasOwnStyle) { GtkBin *bin = GTK_BIN( list_item ); - gtk_widget_set_style( bin->child, + gtk_widget_set_style( bin->child, gtk_style_ref( - gtk_widget_get_style( m_widget ) ) ); + gtk_widget_get_style( m_widget ) ) ); } - - gtk_signal_connect( GTK_OBJECT(list_item), "select", + + gtk_signal_connect( GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - + if (GetWindowStyleFlag() & wxLB_MULTIPLE) - gtk_signal_connect( GTK_OBJECT(list_item), "deselect", + gtk_signal_connect( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - + m_clientData.Append( (wxObject*)clientData ); - + gtk_container_add( GTK_CONTAINER(m_list), list_item ); - + gtk_widget_show( list_item ); - + ConnectWidget( list_item ); - + ConnectDnDWidget( list_item ); - + } void wxListBox::Clear(void) { gtk_list_clear_items( m_list, 0, Number() ); - + m_clientData.Clear(); } void wxListBox::Delete( int n ) { GList *child = g_list_nth( m_list->children, n ); - + if (!child) { wxFAIL_MSG("wrong listbox index"); return; } - + GList *list = g_list_append( NULL, child->data ); gtk_list_remove_items( m_list, list ); g_list_free( list ); - + wxNode *node = m_clientData.Nth( n ); if (!node) { @@ -212,7 +212,11 @@ int wxListBox::FindString( const wxString &item ) const count++; child = child->next; } - wxFAIL_MSG("wrong listbox index"); + + // it's not an error if the string is not found - this function may be used to + // test for existence of the string in the listbox, so don't give any + // errors/assert failures. + return -1; } @@ -220,7 +224,7 @@ char *wxListBox::GetClientData( int n ) const { wxNode *node = m_clientData.Nth( n ); if (node) return ((char*)node->Data()); - + wxFAIL_MSG("wrong listbox index"); return (char *) NULL; } @@ -243,25 +247,25 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const // get the number of selected items first GList *child = m_list->children; int count = 0; - for ( child = m_list->children; child != NULL; child = child->next ) + for ( child = m_list->children; child != NULL; child = child->next ) { - if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) + if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) count++; } aSelections.Empty(); - + if ( count > 0 ) { // now fill the list aSelections.Alloc(count); // optimization attempt int i = 0; - for ( child = m_list->children; child != NULL; child = child->next, i++ ) + for ( child = m_list->children; child != NULL; child = child->next, i++ ) { - if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) + if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) aSelections.Add(i); } } - + return count; } @@ -324,7 +328,7 @@ void wxListBox::SetClientData( int n, char *clientData ) { wxNode *node = m_clientData.Nth( n ); if (node) - { + { node->SetData( (wxObject*)clientData ); } else @@ -395,9 +399,9 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) DisconnectDnDWidget( GTK_WIDGET( child->data ) ); child = child->next; } - + wxWindow::SetDropTarget( dropTarget ); - + child = m_list->children; while (child) { @@ -419,9 +423,9 @@ void wxListBox::SetFont( const wxFont &font ) while (child) { GtkBin *bin = (GtkBin*) child->data; - gtk_widget_set_style( bin->child, + gtk_widget_set_style( bin->child, gtk_style_ref( - gtk_widget_get_style( m_widget ) ) ); + gtk_widget_get_style( m_widget ) ) ); child = child->next; } } @@ -429,7 +433,7 @@ void wxListBox::SetFont( const wxFont &font ) bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) { if (wxWindow::IsOwnGtkWindow( window )) return TRUE; - + GList *child = m_list->children; while (child) { @@ -437,7 +441,7 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) if (bin->child->window == window) return TRUE; child = child->next; } - + return FALSE; } diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 4732b2814d..d434764ba4 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -32,9 +32,9 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox { if (!listbox->HasVMT()) return; if (g_blockEventsOnDrag) return; - + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); - + wxArrayInt aSelections; int count = listbox->GetSelections(aSelections); if ( count > 0 ) @@ -68,23 +68,23 @@ wxListBox::wxListBox(void) m_list = (GtkList *) NULL; } -bool wxListBox::Create( wxWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, +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 ) { m_needParent = TRUE; - + PreCreation( parent, id, pos, size, style, name ); - + SetValidator( validator ); m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); - + m_list = GTK_LIST( gtk_list_new() ); - + GtkSelectionMode mode = GTK_SELECTION_BROWSE; if (style & wxLB_MULTIPLE) mode = GTK_SELECTION_MULTIPLE; @@ -92,40 +92,40 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, mode = GTK_SELECTION_EXTENDED; gtk_list_set_selection_mode( GTK_LIST(m_list), mode ); - + gtk_container_add (GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) ); 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 ); - + for (int i = 0; i < n; i++) { GtkWidget *list_item; - list_item = gtk_list_item_new_with_label( choices[i] ); - + list_item = gtk_list_item_new_with_label( choices[i] ); + gtk_container_add( GTK_CONTAINER(m_list), list_item ); - - gtk_signal_connect( GTK_OBJECT(list_item), "select", + + 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_connect( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - + m_clientData.Append( (wxObject*)NULL ); - + gtk_widget_show( list_item ); } - + PostCreation(); - + gtk_widget_realize( GTK_WIDGET(m_list) ); - + Show( TRUE ); - + return TRUE; } @@ -136,56 +136,56 @@ void wxListBox::Append( const wxString &item ) void wxListBox::Append( const wxString &item, char *clientData ) { - GtkWidget *list_item = gtk_list_item_new_with_label( item ); - + GtkWidget *list_item = gtk_list_item_new_with_label( item ); + if (m_hasOwnStyle) { GtkBin *bin = GTK_BIN( list_item ); - gtk_widget_set_style( bin->child, + gtk_widget_set_style( bin->child, gtk_style_ref( - gtk_widget_get_style( m_widget ) ) ); + gtk_widget_get_style( m_widget ) ) ); } - - gtk_signal_connect( GTK_OBJECT(list_item), "select", + + gtk_signal_connect( GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - + if (GetWindowStyleFlag() & wxLB_MULTIPLE) - gtk_signal_connect( GTK_OBJECT(list_item), "deselect", + gtk_signal_connect( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - + m_clientData.Append( (wxObject*)clientData ); - + gtk_container_add( GTK_CONTAINER(m_list), list_item ); - + gtk_widget_show( list_item ); - + ConnectWidget( list_item ); - + ConnectDnDWidget( list_item ); - + } void wxListBox::Clear(void) { gtk_list_clear_items( m_list, 0, Number() ); - + m_clientData.Clear(); } void wxListBox::Delete( int n ) { GList *child = g_list_nth( m_list->children, n ); - + if (!child) { wxFAIL_MSG("wrong listbox index"); return; } - + GList *list = g_list_append( NULL, child->data ); gtk_list_remove_items( m_list, list ); g_list_free( list ); - + wxNode *node = m_clientData.Nth( n ); if (!node) { @@ -212,7 +212,11 @@ int wxListBox::FindString( const wxString &item ) const count++; child = child->next; } - wxFAIL_MSG("wrong listbox index"); + + // it's not an error if the string is not found - this function may be used to + // test for existence of the string in the listbox, so don't give any + // errors/assert failures. + return -1; } @@ -220,7 +224,7 @@ char *wxListBox::GetClientData( int n ) const { wxNode *node = m_clientData.Nth( n ); if (node) return ((char*)node->Data()); - + wxFAIL_MSG("wrong listbox index"); return (char *) NULL; } @@ -243,25 +247,25 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const // get the number of selected items first GList *child = m_list->children; int count = 0; - for ( child = m_list->children; child != NULL; child = child->next ) + for ( child = m_list->children; child != NULL; child = child->next ) { - if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) + if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) count++; } aSelections.Empty(); - + if ( count > 0 ) { // now fill the list aSelections.Alloc(count); // optimization attempt int i = 0; - for ( child = m_list->children; child != NULL; child = child->next, i++ ) + for ( child = m_list->children; child != NULL; child = child->next, i++ ) { - if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) + if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) aSelections.Add(i); } } - + return count; } @@ -324,7 +328,7 @@ void wxListBox::SetClientData( int n, char *clientData ) { wxNode *node = m_clientData.Nth( n ); if (node) - { + { node->SetData( (wxObject*)clientData ); } else @@ -395,9 +399,9 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) DisconnectDnDWidget( GTK_WIDGET( child->data ) ); child = child->next; } - + wxWindow::SetDropTarget( dropTarget ); - + child = m_list->children; while (child) { @@ -419,9 +423,9 @@ void wxListBox::SetFont( const wxFont &font ) while (child) { GtkBin *bin = (GtkBin*) child->data; - gtk_widget_set_style( bin->child, + gtk_widget_set_style( bin->child, gtk_style_ref( - gtk_widget_get_style( m_widget ) ) ); + gtk_widget_get_style( m_widget ) ) ); child = child->next; } } @@ -429,7 +433,7 @@ void wxListBox::SetFont( const wxFont &font ) bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) { if (wxWindow::IsOwnGtkWindow( window )) return TRUE; - + GList *child = m_list->children; while (child) { @@ -437,7 +441,7 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) if (bin->child->window == window) return TRUE; child = child->next; } - + return FALSE; }