X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f96aa4d9eb296b3dfc468a351ce013bf92fab983..ef44a62179cde47dffb369b9731b2f74d54de52f:/src/gtk/listbox.cpp diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index f3aefb791a..2793afeb92 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -17,6 +17,16 @@ #include "wx/utils.h" #include +//------------------------------------------------------------------------- +// conditional compilation +//------------------------------------------------------------------------- + +#if (GTK_MINOR_VERSION == 1) +#if (GTK_MICRO_VERSION >= 5) +#define NEW_GTK_SCROLL_CODE +#endif +#endif + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -29,31 +39,30 @@ extern bool g_blockEventsOnDrag; static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox ) { - if (!listbox->HasVMT()) return; - if (g_blockEventsOnDrag) return; + if (!listbox->HasVMT()) return; + if (g_blockEventsOnDrag) return; - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); + 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); + 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.m_commandInt = -1 ; + event.m_commandString = copystring("") ; } - event.SetEventObject( listbox ); + event.SetEventObject( listbox ); - listbox->GetEventHandler()->ProcessEvent( event ); - if (event.m_commandString) delete[] event.m_commandString ; + listbox->GetEventHandler()->ProcessEvent( event ); + if (event.m_commandString) delete[] event.m_commandString ; } //----------------------------------------------------------------------------- @@ -62,453 +71,497 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) -wxListBox::wxListBox(void) +wxListBox::wxListBox() { - m_list = (GtkList *) NULL; + 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 wxValidator& validator, const wxString &name ) + const wxPoint &pos, const wxSize &size, + int n, const wxString choices[], + long style, const wxValidator& validator, const wxString &name ) { - m_needParent = TRUE; + m_needParent = TRUE; - PreCreation( parent, id, pos, size, style, name ); + PreCreation( parent, id, pos, size, style, name ); - SetValidator( validator ); + 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_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() ); + m_list = GTK_LIST( gtk_list_new() ); - GtkSelectionMode mode = GTK_SELECTION_BROWSE; - if (style & wxLB_MULTIPLE) - mode = GTK_SELECTION_MULTIPLE; - else if (style & wxLB_EXTENDED) - mode = GTK_SELECTION_EXTENDED; + 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_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) ); +#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 - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 100; - if (newSize.y == -1) newSize.y = 110; - SetSize( newSize.x, newSize.y ); + gtk_widget_show( GTK_WIDGET(m_list) ); - for (int i = 0; i < n; i++) - { - GtkWidget *list_item; - list_item = gtk_list_item_new_with_label( choices[i] ); + wxSize newSize = size; + if (newSize.x == -1) newSize.x = 100; + if (newSize.y == -1) newSize.y = 110; + SetSize( newSize.x, newSize.y ); - gtk_container_add( GTK_CONTAINER(m_list), list_item ); + for (int i = 0; i < n; i++) + { + m_clientDataList.Append( (wxObject*) NULL ); + m_clientObjectList.Append( (wxObject*) NULL ); + + GtkWidget *list_item; + list_item = gtk_list_item_new_with_label( choices[i] ); - 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 ); + gtk_signal_connect( GTK_OBJECT(list_item), "select", + GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - m_clientData.Append( (wxObject*)NULL ); + if (style & wxLB_MULTIPLE) + gtk_signal_connect( GTK_OBJECT(list_item), "deselect", + GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - gtk_widget_show( list_item ); - } + ConnectWidget( list_item ); + + gtk_widget_show( list_item ); + } + + m_parent->AddChild( this ); - PostCreation(); + (m_parent->m_insertCallback)( m_parent, this ); + + PostCreation(); - gtk_widget_realize( GTK_WIDGET(m_list) ); + gtk_widget_realize( GTK_WIDGET(m_list) ); - SetBackgroundColour( parent->GetBackgroundColour() ); + SetBackgroundColour( parent->GetBackgroundColour() ); + SetForegroundColour( parent->GetForegroundColour() ); - Show( TRUE ); + Show( TRUE ); - return TRUE; + return TRUE; } -void wxListBox::Append( const wxString &item ) +wxListBox::~wxListBox() { - Append( item, (char*)NULL ); + Clear(); } -void wxListBox::Append( const wxString &item, char *clientData ) +void wxListBox::AppendCommon( const wxString &item ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, "invalid listbox" ); + + GtkWidget *list_item = gtk_list_item_new_with_label( item ); - GtkWidget *list_item = gtk_list_item_new_with_label( item ); + gtk_signal_connect( GTK_OBJECT(list_item), "select", + GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - if (m_hasOwnStyle) - { - GtkBin *bin = GTK_BIN( list_item ); - gtk_widget_set_style( bin->child, - gtk_style_ref( - gtk_widget_get_style( m_widget ) ) ); - } + 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 ); + + if (m_widgetStyle) ApplyWidgetStyle(); - gtk_signal_connect( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); + gtk_widget_show( list_item ); - if (GetWindowStyleFlag() & wxLB_MULTIPLE) - gtk_signal_connect( GTK_OBJECT(list_item), "deselect", - GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); + ConnectWidget( list_item ); + +#ifndef NEW_GTK_DND_CODE + if (m_dropTarget) m_dropTarget->RegisterWidget( list_item ); +#endif +} + +void wxListBox::Append( const wxString &item ) +{ + m_clientDataList.Append( (wxObject*) NULL ); + m_clientObjectList.Append( (wxObject*) NULL ); + + AppendCommon( item ); +} + +void wxListBox::Append( const wxString &item, void *clientData ) +{ + m_clientDataList.Append( (wxObject*) clientData ); + m_clientObjectList.Append( (wxObject*) NULL ); + + AppendCommon( item ); +} - m_clientData.Append( (wxObject*)clientData ); +void wxListBox::Append( const wxString &item, wxClientData *clientData ) +{ + m_clientObjectList.Append( (wxObject*) clientData ); + m_clientDataList.Append( (wxObject*) NULL ); + + AppendCommon( item ); +} - gtk_container_add( GTK_CONTAINER(m_list), list_item ); +void wxListBox::SetClientData( int n, void* clientData ) +{ + wxCHECK_RET( m_widget != NULL, "invalid combobox" ); + + wxNode *node = m_clientDataList.Nth( n ); + if (!node) return; + + node->SetData( (wxObject*) clientData ); +} - gtk_widget_show( list_item ); +void* wxListBox::GetClientData( int n ) +{ + wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" ); + + wxNode *node = m_clientDataList.Nth( n ); + if (!node) return NULL; + + return node->Data(); +} - ConnectWidget( list_item ); +void wxListBox::SetClientObject( int n, wxClientData* clientData ) +{ + wxCHECK_RET( m_widget != NULL, "invalid combobox" ); + + wxNode *node = m_clientObjectList.Nth( n ); + if (!node) return; + + wxClientData *cd = (wxClientData*) node->Data(); + if (cd) delete cd; + + node->SetData( (wxObject*) clientData ); +} - ConnectDnDWidget( list_item ); +wxClientData* wxListBox::GetClientObject( int n ) +{ + wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" ); + + wxNode *node = m_clientObjectList.Nth( n ); + if (!node) return (wxClientData*) NULL; + + return (wxClientData*) node->Data(); } -void wxListBox::Clear(void) +void wxListBox::Clear() { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, "invalid listbox" ); - gtk_list_clear_items( m_list, 0, Number() ); + gtk_list_clear_items( m_list, 0, Number() ); - m_clientData.Clear(); + wxNode *node = m_clientObjectList.First(); + while (node) + { + wxClientData *cd = (wxClientData*)node->Data(); + if (cd) delete cd; + node = node->Next(); + } + m_clientObjectList.Clear(); + + m_clientDataList.Clear(); } void wxListBox::Delete( int n ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, "invalid listbox" ); - GList *child = g_list_nth( m_list->children, n ); + GList *child = g_list_nth( m_list->children, n ); - if (!child) - { - wxFAIL_MSG("wrong listbox index"); - return; - } + 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 ); + 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("wrong listbox index"); - } - else - m_clientData.DeleteNode( node ); + wxNode *node = m_clientObjectList.Nth( n ); + if (node) + { + wxClientData *cd = (wxClientData*)node->Data(); + if (cd) delete cd; + m_clientObjectList.DeleteNode( node ); + } + + node = m_clientDataList.Nth( n ); + if (node) + { + m_clientDataList.DeleteNode( node ); + } } void wxListBox::Deselect( int n ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, "invalid listbox" ); - gtk_list_unselect_item( m_list, n ); + gtk_list_unselect_item( m_list, n ); } int wxListBox::FindString( const wxString &item ) const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - GList *child = m_list->children; - int count = 0; - while (child) - { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = GTK_LABEL( bin->child ); - if (item == label->label) return count; - count++; - child = child->next; - } - - // 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. + GList *child = m_list->children; + int count = 0; + while (child) + { + GtkBin *bin = GTK_BIN( child->data ); + GtkLabel *label = GTK_LABEL( bin->child ); + if (item == label->label) return count; + count++; + child = child->next; + } + + // it's not an error if the string is not found -> no wxCHECK return -1; } -char *wxListBox::GetClientData( int n ) const +int wxListBox::GetSelection() const { - wxCHECK_MSG( m_list != NULL, (char*) NULL, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - wxNode *node = m_clientData.Nth( n ); - if (node) return ((char*)node->Data()); - - wxFAIL_MSG("wrong listbox index"); - return (char *) NULL; + GList *child = m_list->children; + int count = 0; + while (child) + { + if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) return count; + count++; + child = child->next; + } + return -1; } -int wxListBox::GetSelection(void) const +int wxListBox::GetSelections( wxArrayInt& aSelections ) const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - GList *child = m_list->children; - int count = 0; - while (child) - { - if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) return count; - count++; - child = child->next; - } - return -1; -} + // 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++; + } -int wxListBox::GetSelections(wxArrayInt& aSelections) const -{ - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - - // 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++ ) + aSelections.Empty(); + + if (count > 0) { - if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED ) - aSelections.Add(i); + // 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; + return count; } wxString wxListBox::GetString( int n ) const { - wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, "", "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 ); - return label->label; - } - wxFAIL_MSG("wrong listbox index"); - return ""; + GList *child = g_list_nth( m_list->children, n ); + if (child) + { + 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 +wxString wxListBox::GetStringSelection() const { - wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); - GList *selection = m_list->selection; - if (selection) - { - GtkBin *bin = GTK_BIN( selection->data ); - wxString tmp = GTK_LABEL( bin->child )->label; - return tmp; - } - wxFAIL_MSG("no listbox selection available"); - return ""; + GList *selection = m_list->selection; + if (selection) + { + 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) +int wxListBox::Number() { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); - GList *child = m_list->children; - int count = 0; - while (child) { count++; child = child->next; } - return count; + GList *child = m_list->children; + int count = 0; + while (child) { count++; child = child->next; } + return count; } bool wxListBox::Selected( int n ) { - wxCHECK_MSG( m_list != NULL, FALSE, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, FALSE, "invalid listbox" ); - GList *target = g_list_nth( m_list->children, n ); - if (target) - { - GList *child = m_list->selection; - while (child) + GList *target = g_list_nth( m_list->children, n ); + if (target) { - if (child->data == target->data) return TRUE; - child = child->next; + GList *child = m_list->selection; + while (child) + { + if (child->data == target->data) return TRUE; + child = child->next; + } } - } - wxFAIL_MSG("wrong listbox index"); - return FALSE; + 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 ) -{ - wxCHECK_RET( m_list != NULL, "invalid listbox" ); - - wxNode *node = m_clientData.Nth( n ); - if (node) - { - node->SetData( (wxObject*)clientData ); - } - else - { - wxFAIL_MSG("wrong listbox index"); - } + wxFAIL_MSG("wxListBox::Set not implemented"); } void wxListBox::SetFirstItem( int WXUNUSED(n) ) { - wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); + wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); } void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) ) { - wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); + wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); } void wxListBox::SetSelection( int n, bool select ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, "invalid listbox" ); - if (select) - gtk_list_select_item( m_list, n ); - else - gtk_list_unselect_item( m_list, n ); + if (select) + gtk_list_select_item( m_list, n ); + else + gtk_list_unselect_item( m_list, n ); } void wxListBox::SetString( int n, const wxString &string ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, "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 ); - gtk_label_set( label, string ); - } - else - { - wxFAIL_MSG("wrong listbox index"); - } + 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 ); + } + else + { + wxFAIL_MSG("wrong listbox index"); + } } void wxListBox::SetStringSelection( const wxString &string, bool select ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, "invalid listbox" ); - SetSelection( FindString(string), select ); + SetSelection( FindString(string), select ); } int wxListBox::GetIndex( GtkWidget *item ) const { - if (item) - { - GList *child = m_list->children; - int count = 0; - while (child) + if (item) { - if (GTK_WIDGET(child->data) == item) return count; - count++; - child = child->next; + GList *child = m_list->children; + int count = 0; + while (child) + { + if (GTK_WIDGET(child->data) == item) return count; + count++; + child = child->next; + } } - } - return -1; + return -1; } void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, "invalid listbox" ); - GList *child = m_list->children; - while (child) - { - DisconnectDnDWidget( GTK_WIDGET( child->data ) ); - child = child->next; - } - - wxWindow::SetDropTarget( dropTarget ); +#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 ); - child = m_list->children; - while (child) - { - ConnectDnDWidget( GTK_WIDGET( child->data ) ); - child = child->next; - } +#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 } -GtkWidget *wxListBox::GetConnectWidget(void) +GtkWidget *wxListBox::GetConnectWidget() { - return GTK_WIDGET(m_list); + return GTK_WIDGET(m_list); } bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) { - if (wxWindow::IsOwnGtkWindow( window )) return TRUE; - - GList *child = m_list->children; - while (child) - { - GtkBin *bin = GTK_BIN( child->data ); - if (bin->child->window == window) return TRUE; - child = child->next; - } + if (wxWindow::IsOwnGtkWindow( window )) return TRUE; - return FALSE; -} + GList *child = m_list->children; + while (child) + { + GtkWidget *bin = GTK_WIDGET( child->data ); + if (bin->window == window) return TRUE; + child = child->next; + } -void wxListBox::SetFont( const wxFont &font ) -{ - wxCHECK_RET( m_list != NULL, "invalid listbox" ); - - wxControl::SetFont( font ); - - GList *child = m_list->children; - while (child) - { - gtk_widget_set_style( GTK_BIN(child->data)->child, - gtk_style_ref( - gtk_widget_get_style( m_widget ) ) ); - - child = child->next; - } + return FALSE; } -void wxListBox::SetBackgroundColour( const wxColour &colour ) +void wxListBox::ApplyWidgetStyle() { - return; - - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + SetWidgetStyle(); - wxControl::SetBackgroundColour( colour ); - - return; - - if (!m_backgroundColour.Ok()) return; - - gtk_widget_set_style( GTK_WIDGET(m_list), - gtk_style_ref( - gtk_widget_get_style( m_widget ) ) ); + if (m_backgroundColour.Ok()) + { + GdkWindow *window = GTK_WIDGET(m_list)->window; + m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); + gdk_window_set_background( window, m_backgroundColour.GetColor() ); + gdk_window_clear( window ); + } - GList *child = m_list->children; - while (child) - { - gtk_widget_set_style( GTK_WIDGET(child->data), - gtk_style_ref( - gtk_widget_get_style( m_widget ) ) ); - - gtk_widget_set_style( GTK_BIN(child->data)->child, - gtk_style_ref( - gtk_widget_get_style( m_widget ) ) ); - - child = child->next; - } + GList *child = m_list->children; + while (child) + { + gtk_widget_set_style( GTK_BIN(child->data)->child, m_widgetStyle ); + gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle ); + child = child->next; + } } -