X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09cf7c5853e45018195dd43805e4d88ff33f8692..42871d38193dcaa37644ad3be452540c9f545343:/src/gtk1/listbox.cpp diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index ba55ab7bd7..916d8490ad 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -5,7 +5,7 @@ // Created: 01/02/97 // Id: // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,6 +16,7 @@ #include "wx/dynarray.h" #include "wx/listbox.h" #include "wx/utils.h" +#include //----------------------------------------------------------------------------- // data @@ -51,9 +52,10 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox } event.SetEventObject( listbox ); + listbox->GetEventHandler()->ProcessEvent( event ); if (event.m_commandString) delete[] event.m_commandString ; -}; +} //----------------------------------------------------------------------------- @@ -61,27 +63,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) wxListBox::wxListBox(void) { - m_list = NULL; -}; - -wxListBox::wxListBox( wxWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - int n, const wxString choices[], - long style, const wxString &name ) -{ - Create( parent, id, pos, size, n, choices, style, name ); -}; + m_list = (GtkList *) NULL; +} bool wxListBox::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int n, const wxString choices[], - long style, const wxString &name ) + long style, const wxValidator& validator, const wxString &name ) { m_needParent = TRUE; PreCreation( parent, id, pos, size, style, name ); - m_widget = gtk_scrolled_window_new( NULL, NULL ); + 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 ); @@ -116,7 +112,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, m_clientData.Append( (wxObject*)NULL ); gtk_widget_show( list_item ); - }; + } PostCreation(); @@ -125,12 +121,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, Show( TRUE ); return TRUE; -}; +} void wxListBox::Append( const wxString &item ) { Append( item, (char*)NULL ); -}; +} void wxListBox::Append( const wxString &item, char *clientData ) { @@ -144,37 +140,47 @@ void wxListBox::Append( const wxString &item, char *clientData ) gtk_signal_connect( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - gtk_container_add( GTK_CONTAINER(m_list), list_item ); - m_clientData.Append( (wxObject*)clientData ); + gtk_container_add( GTK_CONTAINER(m_list), list_item ); + gtk_widget_show( list_item ); -}; +} void wxListBox::Clear(void) { gtk_list_clear_items( m_list, 0, Number() ); m_clientData.Clear(); -}; +} void wxListBox::Delete( int n ) { - gtk_list_clear_items( m_list, n, 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) { - wxFAIL_MSG("wxListBox::Delete wrong index"); + wxFAIL_MSG("wrong listbox index"); } else m_clientData.DeleteNode( node ); -}; +} void wxListBox::Deselect( int n ) { gtk_list_unselect_item( m_list, n ); -}; +} int wxListBox::FindString( const wxString &item ) const { @@ -187,16 +193,19 @@ int wxListBox::FindString( const wxString &item ) const if (item == label->label) return count; count++; child = child->next; - }; + } + wxFAIL_MSG("wrong listbox index"); return -1; -}; +} char *wxListBox::GetClientData( int n ) const { wxNode *node = m_clientData.Nth( n ); if (node) return ((char*)node->Data()); - return NULL; -}; + + wxFAIL_MSG("wrong listbox index"); + return (char *) NULL; +} int wxListBox::GetSelection(void) const { @@ -210,10 +219,11 @@ int wxListBox::GetSelection(void) const if (child->data == selection->data) return count; count++; child = child->next; - }; - }; + } + } + wxFAIL_MSG("wrong listbox index"); return -1; -}; +} int wxListBox::GetSelections(wxArrayInt& aSelections) const { @@ -238,7 +248,7 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const } return count; -}; +} wxString wxListBox::GetString( int n ) const { @@ -248,9 +258,10 @@ wxString wxListBox::GetString( int n ) const GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); return label->label; - }; + } + wxFAIL_MSG("wrong listbox index"); return ""; -}; +} wxString wxListBox::GetStringSelection(void) const { @@ -260,17 +271,18 @@ wxString wxListBox::GetStringSelection(void) const GtkBin *bin = GTK_BIN( selection->data ); wxString tmp = GTK_LABEL( bin->child )->label; return tmp; - }; + } + wxFAIL_MSG("no listbox selection available"); return ""; -}; +} int wxListBox::Number(void) { GList *child = m_list->children; int count = 0; - while (child) { count++; child = child->next; }; + while (child) { count++; child = child->next; } return count; -}; +} bool wxListBox::Selected( int n ) { @@ -282,28 +294,39 @@ bool wxListBox::Selected( int n ) { if (child->data == target->data) return TRUE; child = child->next; - }; - }; + } + } + wxFAIL_MSG("wrong listbox index"); return FALSE; -}; +} void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) ) { -}; + wxFAIL_MSG("wxListBox::Set not implemented"); +} void wxListBox::SetClientData( int n, char *clientData ) { wxNode *node = m_clientData.Nth( n ); - if (node) node->SetData( (wxObject*)clientData ); -}; + if (node) + { + node->SetData( (wxObject*)clientData ); + } + else + { + wxFAIL_MSG("wrong listbox index"); + } +} void wxListBox::SetFirstItem( int WXUNUSED(n) ) { -}; + wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); +} void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) ) { -}; + wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); +} void wxListBox::SetSelection( int n, bool select ) { @@ -311,7 +334,7 @@ void wxListBox::SetSelection( int n, bool select ) gtk_list_select_item( m_list, n ); else gtk_list_unselect_item( m_list, n ); -}; +} void wxListBox::SetString( int n, const wxString &string ) { @@ -321,13 +344,17 @@ void wxListBox::SetString( int n, const wxString &string ) GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); gtk_label_set( label, string ); - }; -}; + } + else + { + wxFAIL_MSG("wrong listbox index"); + } +} void wxListBox::SetStringSelection( const wxString &string, bool select ) { SetSelection( FindString(string), select ); -}; +} int wxListBox::GetIndex( GtkWidget *item ) const { @@ -340,15 +367,15 @@ int wxListBox::GetIndex( GtkWidget *item ) const if (GTK_WIDGET(child->data) == item) return count; count++; child = child->next; - }; - }; + } + } return -1; -}; +} -GtkWidget *wxListBox::GetDropTargetWidget(void) +GtkWidget *wxListBox::GetConnectWidget(void) { return GTK_WIDGET(m_list); -}; +}