-bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
- const wxPoint& pos, const wxSize& size,
- int n, const wxString choices[],
- long style, const wxValidator& validator, const wxString& name )
-{
- m_alreadySent = FALSE;
- m_needParent = TRUE;
-
- PreCreation( parent, id, pos, size, style, name );
-
- SetValidator( validator );
-
- m_widget = gtk_combo_new();
-
- wxSize newSize = size;
- if (newSize.x == -1) newSize.x = 100;
- if (newSize.y == -1) newSize.y = 26;
- SetSize( newSize.x, newSize.y );
-
- GtkWidget *list = GTK_COMBO(m_widget)->list;
-
- for (int i = 0; i < n; i++)
- {
- GtkWidget *list_item;
- list_item = gtk_list_item_new_with_label( choices[i] );
-
- gtk_container_add( GTK_CONTAINER(list), list_item );
-
- m_clientData.Append( (wxObject*)NULL );
-
- gtk_widget_show( list_item );
-
- gtk_signal_connect( GTK_OBJECT(list_item), "select",
- GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
- }
-
- PostCreation();
-
-/*
- gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
- GTK_SIGNAL_FUNC(gtk_combo_size_callback), (gpointer)this );
-*/
-
- if (!value.IsNull()) SetValue( value );
-
- Show( TRUE );
-
- return TRUE;
-}
-
-void wxComboBox::Clear(void)
-{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
- gtk_list_clear_items( GTK_LIST(list), 0, Number() );
-
- m_clientData.Clear();
-}
-
-void wxComboBox::Append( const wxString &item )
-{
- Append( item, (char*)NULL );
-}
-
-void wxComboBox::Append( const wxString &item, char *clientData )
-{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
-
- GtkWidget *list_item;
- list_item = gtk_list_item_new_with_label( item );
-
- gtk_signal_connect( GTK_OBJECT(list_item), "select",
- GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
- m_clientData.Append( (wxObject*)clientData );
-
- gtk_container_add( GTK_CONTAINER(list), list_item );
-
- gtk_widget_show( list_item );
-}
-
-void wxComboBox::Delete( int n )
-{
- GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
-
- GList *child = g_list_nth( listbox->children, n );
-
- if (!child)
- {
- wxFAIL_MSG("wrong index");
- return;
- }
-
- GList *list = g_list_append( NULL, child->data );
- gtk_list_remove_items( listbox, list );
- g_list_free( list );
-
- wxNode *node = m_clientData.Nth( n );
- if (!node)
- {
- wxFAIL_MSG( "wrong index" );
- }
- else
- m_clientData.DeleteNode( node );
-}
-
-int wxComboBox::FindString( const wxString &item )
-{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
-
- GList *child = GTK_LIST(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;
- }
-
- wxFAIL_MSG( "wxComboBox: string not found" );
-
- return -1;
-}
-
-char* wxComboBox::GetClientData( int n )
-{
- wxNode *node = m_clientData.Nth( n );
- if (node) return (char*)node->Data();
-
- wxFAIL_MSG( "wxComboBox: wrong index" );
-
- return (char *) NULL;
-}
-
-void wxComboBox::SetClientData( int n, char * clientData )
-{
- wxNode *node = m_clientData.Nth( n );
- if (node) node->SetData( (wxObject*) clientData );
-
- wxFAIL_MSG( "wxComboBox: wrong index" );
-}
-
-int wxComboBox::GetSelection(void) const
-{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
-
- GList *selection = GTK_LIST(list)->selection;
- if (selection)
- {
- GList *child = GTK_LIST(list)->children;
+ DisableEvents();
+
+ GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+ const unsigned int count = GetCount();
+ for (unsigned int i = 0; i < count; i++)
+ gtk_combo_box_remove_text( combobox, 0 );
+
+ m_clientData.Clear();
+
+ if(m_strings)
+ m_strings->Clear();
+
+ EnableEvents();
+
+ InvalidateBestSize();
+}
+
+void wxComboBox::DoDeleteOneItem(unsigned int n)
+{
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+
+ wxCHECK_RET( IsValid(n), wxT("invalid index") );
+
+ GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+ gtk_combo_box_remove_text( combobox, n );
+
+ m_clientData.RemoveAt( n );
+ if(m_strings)
+ m_strings->RemoveAt( n );
+
+ InvalidateBestSize();
+}
+
+void wxComboBox::SetString(unsigned int n, const wxString &text)
+{
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+
+ GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+ wxCHECK_RET( IsValid(n), wxT("invalid index") );
+
+ GtkTreeModel *model = gtk_combo_box_get_model( combobox );
+ GtkTreeIter iter;
+ if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
+ {
+ GValue value = { 0, };
+ g_value_init( &value, G_TYPE_STRING );
+ g_value_set_string( &value, wxGTK_CONV( text ) );
+ gtk_list_store_set_value( GTK_LIST_STORE(model), &iter, 0, &value );
+ g_value_unset( &value );
+ }
+
+ InvalidateBestSize();
+}
+
+int wxComboBox::FindString( const wxString &item, bool bCase ) const
+{
+ wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid combobox") );
+
+ GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+ GtkTreeModel* model = gtk_combo_box_get_model( combobox );
+ GtkTreeIter iter;
+ gtk_tree_model_get_iter_first( model, &iter );
+ if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter ))
+ return -1;