X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..cb6780ff0129b790a29c0660e936430b0b063db8:/src/gtk1/listbox.cpp diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 37dd67fef3..e149810090 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 ///////////////////////////////////////////////////////////////////////////// @@ -13,29 +13,49 @@ #pragma implementation "listbox.h" #endif +#include "wx/dynarray.h" #include "wx/listbox.h" +#include "wx/utils.h" +#include + +//----------------------------------------------------------------------------- +// data +//----------------------------------------------------------------------------- + +extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- // wxListBox //----------------------------------------------------------------------------- -void gtk_listitem_select_callback( GtkWidget *widget, gpointer data ) +static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox ) { - wxListBox *listbox = (wxListBox*)data; - - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); - - event.SetInt( listbox->GetIndex( widget ) ); + if (!listbox->HasVMT()) return; + if (g_blockEventsOnDrag) return; - GtkBin *bin = GTK_BIN( widget ); - GtkLabel *label = GTK_LABEL( bin->child ); - wxString tmp( label->label ); - event.SetString( WXSTRINGCAST(tmp) ); + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); + 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 != "") + event.m_commandString = copystring((char *)(const char *)str); + } + else + { + event.m_commandInt = -1 ; + event.m_commandString = copystring("") ; + } + event.SetEventObject( listbox ); - - listbox->ProcessEvent( event ); -}; + + listbox->GetEventHandler()->ProcessEvent( event ); + if (event.m_commandString) delete[] event.m_commandString ; +} //----------------------------------------------------------------------------- @@ -44,31 +64,33 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) wxListBox::wxListBox(void) { m_list = NULL; -}; - -wxListBox::wxListBox( wxWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const int n, const wxString choices[], - const long style, const wxString &name ) -{ - Create( parent, id, pos, size, n, choices, style, name ); -}; +} bool wxListBox::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, - const int n, const wxString choices[], - const long style, const wxString &name ) + 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( NULL, NULL ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); m_list = GTK_LIST( gtk_list_new() ); - gtk_list_set_selection_mode( GTK_LIST(m_list), GTK_SELECTION_BROWSE ); + + // @@ what's the difference between BROWSE and SINGLE? + GtkSelectionMode mode = GTK_SELECTION_BROWSE; + if ( style & wxLB_MULTIPLE ) + mode = GTK_SELECTION_MULTIPLE; + else if ( style & wxLB_EXTENDED ) + 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) ); @@ -78,52 +100,77 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, GtkWidget *list_item; 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_FUNC(gtk_listitem_select_callback), (gpointer)this ); - gtk_container_add( GTK_CONTAINER(m_list), list_item ); + if ( style & wxLB_MULTIPLE ) + 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; -}; +} void wxListBox::Append( const wxString &item ) +{ + Append( item, (char*)NULL ); +} + +void wxListBox::Append( const wxString &item, char *clientData ) { GtkWidget *list_item; list_item = gtk_list_item_new_with_label( 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 ( GetWindowStyleFlag() & wxLB_MULTIPLE ) + 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_widget_show( list_item ); -}; - -void wxListBox::Append( const wxString &WXUNUSED(item), char *WXUNUSED(clientData) ) -{ -}; +} 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 ); -}; + + wxNode *node = m_clientData.Nth( n ); + if (!node) + { + wxFAIL_MSG("wxListBox::Delete wrong 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 { @@ -136,14 +183,16 @@ int wxListBox::FindString( const wxString &item ) const if (item == label->label) return count; count++; child = child->next; - }; + } return -1; -}; +} -char *wxListBox::GetClientData( const int WXUNUSED(n) ) const +char *wxListBox::GetClientData( int n ) const { + wxNode *node = m_clientData.Nth( n ); + if (node) return ((char*)node->Data()); return NULL; -}; +} int wxListBox::GetSelection(void) const { @@ -157,15 +206,35 @@ int wxListBox::GetSelection(void) const if (child->data == selection->data) return count; count++; child = child->next; - }; - }; + } + } return -1; -}; +} -int wxListBox::GetSelections( int **WXUNUSED(selections) ) const +int wxListBox::GetSelections(wxArrayInt& aSelections) const { - return 0; -}; + // 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 ) { + 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++ ) { + if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) + aSelections.Add(i); + } + } + + return count; +} wxString wxListBox::GetString( int n ) const { @@ -175,9 +244,9 @@ wxString wxListBox::GetString( int n ) const GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); return label->label; - }; + } return ""; -}; +} wxString wxListBox::GetStringSelection(void) const { @@ -187,19 +256,19 @@ wxString wxListBox::GetStringSelection(void) const GtkBin *bin = GTK_BIN( selection->data ); wxString tmp = GTK_LABEL( bin->child )->label; return tmp; - }; + } 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( const int n ) +bool wxListBox::Selected( int n ) { GList *target = g_list_nth( m_list->children, n ); if (target) @@ -209,43 +278,52 @@ bool wxListBox::Selected( const int n ) { if (child->data == target->data) return TRUE; child = child->next; - }; - }; + } + } return FALSE; -}; +} -void wxListBox::Set( const int WXUNUSED(n), const wxString *WXUNUSED(choices) ) +void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) ) { -}; +} -void wxListBox::SetClientData( const int WXUNUSED(n), char *WXUNUSED(clientData) ) +void wxListBox::SetClientData( int n, char *clientData ) { -}; + wxNode *node = m_clientData.Nth( n ); + if (node) node->SetData( (wxObject*)clientData ); +} void wxListBox::SetFirstItem( int WXUNUSED(n) ) { -}; +} void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) ) { -}; +} -void wxListBox::SetSelection( const int n, const bool select ) +void wxListBox::SetSelection( int n, bool select ) { if (select) gtk_list_select_item( m_list, n ); else gtk_list_unselect_item( m_list, n ); -}; +} -void wxListBox::SetString( const int WXUNUSED(n), const wxString &WXUNUSED(string) ) +void wxListBox::SetString( int n, const wxString &string ) { -}; + GList *child = g_list_nth( m_list->children, n ); + if (child) + { + GtkBin *bin = GTK_BIN( child->data ); + GtkLabel *label = GTK_LABEL( bin->child ); + gtk_label_set( label, string ); + } +} -void wxListBox::SetStringSelection( const wxString &string, const bool select ) +void wxListBox::SetStringSelection( const wxString &string, bool select ) { SetSelection( FindString(string), select ); -}; +} int wxListBox::GetIndex( GtkWidget *item ) const { @@ -258,9 +336,15 @@ int wxListBox::GetIndex( GtkWidget *item ) const if (GTK_WIDGET(child->data) == item) return count; count++; child = child->next; - }; - }; + } + } return -1; -}; +} + +GtkWidget *wxListBox::GetConnectWidget(void) +{ + return GTK_WIDGET(m_list); +} +