#ifndef WX_PRECOMP
#include "wx/intl.h"
+ #include "wx/settings.h"
+ #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
+ #include "wx/arrstr.h"
#endif
-#include "wx/settings.h"
-#include "wx/arrstr.h"
-
-#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
-
#include "wx/gtk1/private.h"
//-----------------------------------------------------------------------------
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
event.SetString( combo->GetValue() );
event.SetEventObject( combo );
- combo->GetEventHandler()->ProcessEvent( event );
+ combo->HandleWindowEvent( event );
}
}
event.SetInt( curSelection );
event.SetString( combo->GetStringSelection() );
event.SetEventObject( combo );
- combo->GetEventHandler()->ProcessEvent( event );
+ combo->HandleWindowEvent( event );
// for consistency with the other ports, send TEXT event
wxCommandEvent event2( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
event2.SetString( combo->GetStringSelection() );
event2.SetEventObject( combo );
- combo->GetEventHandler()->ProcessEvent( event2 );
+ combo->HandleWindowEvent( event2 );
}
}
}
event.SetInt( curSelection );
event.SetString( combo->GetStringSelection() );
event.SetEventObject( combo );
- combo->GetEventHandler()->ProcessEvent( event );
+ combo->HandleWindowEvent( event );
// for consistency with the other ports, don't generate text update
// events while the user is browsing the combobox neither
wxCommandEvent event2( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
event2.SetString( combo->GetValue() );
event2.SetEventObject( combo );
- combo->GetEventHandler()->ProcessEvent( event2 );
+ combo->HandleWindowEvent( event2 );
}
}
}
{
GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( choices[i] ) );
- m_clientDataList.Append( (wxObject*)NULL );
- m_clientObjectList.Append( (wxObject*)NULL );
+ m_clientDataList.Append( NULL );
+ m_clientObjectList.Append( NULL );
gtk_container_add( GTK_CONTAINER(list), list_item );
gtk_signal_connect_after( GTK_OBJECT(combo->list), "select-child",
GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
- SetBestSize(size); // need this too because this is a wxControlWithItems
+ SetInitialSize(size); // need this too because this is a wxControlWithItems
// This is required for tool bar support
// wxSize setsize = GetSize();
gtk_widget_grab_focus( m_focusWidget );
}
-int wxComboBox::DoAppend( const wxString &item )
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ void **clientData,
+ wxClientDataType type)
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
- GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
-
- gtk_container_add( GTK_CONTAINER(list), list_item );
-
- if (GTK_WIDGET_REALIZED(m_widget))
- {
- gtk_widget_realize( list_item );
- gtk_widget_realize( GTK_BIN(list_item)->child );
- }
-
- // Apply current widget style to the new list_item
GtkRcStyle *style = CreateWidgetStyle();
- if (style)
- {
- gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
- GtkBin *bin = GTK_BIN( list_item );
- GtkWidget *label = GTK_WIDGET( bin->child );
- gtk_widget_modify_style( label, style );
- gtk_rc_style_unref( style );
- }
-
- gtk_widget_show( list_item );
-
- const unsigned int count = GetCount();
-
- if ( m_clientDataList.GetCount() < count )
- m_clientDataList.Append( (wxObject*) NULL );
- if ( m_clientObjectList.GetCount() < count )
- m_clientObjectList.Append( (wxObject*) NULL );
-
- EnableEvents();
-
- InvalidateBestSize();
-
- return count - 1;
-}
-
-int wxComboBox::DoInsert( const wxString &item, unsigned int pos )
-{
- wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
- wxT("can't insert into sorted list"));
-
- wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
- wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index") );
+ const unsigned int count = items.GetCount();
+ for( unsigned int i = 0; i < count; ++i, ++pos )
+ {
+ GtkWidget *
+ list_item = gtk_list_item_new_with_label( wxGTK_CONV( items[i] ) );
- if (pos == GetCount())
- return Append(item);
+ if ( pos == GetCount() )
+ {
+ gtk_container_add( GTK_CONTAINER(list), list_item );
+ }
+ else // insert, not append
+ {
+ GList *gitem_list = g_list_alloc ();
+ gitem_list->data = list_item;
+ gtk_list_insert_items( GTK_LIST (list), gitem_list, pos );
+ }
- DisableEvents();
+ if (GTK_WIDGET_REALIZED(m_widget))
+ {
+ gtk_widget_realize( list_item );
+ gtk_widget_realize( GTK_BIN(list_item)->child );
- GtkWidget *list = GTK_COMBO(m_widget)->list;
+ if (style)
+ {
+ gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
+ GtkBin *bin = GTK_BIN( list_item );
+ GtkWidget *label = GTK_WIDGET( bin->child );
+ gtk_widget_modify_style( label, style );
+ }
- GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
+ }
- GList *gitem_list = g_list_alloc ();
- gitem_list->data = list_item;
- gtk_list_insert_items( GTK_LIST (list), gitem_list, pos );
+ gtk_widget_show( list_item );
- if (GTK_WIDGET_REALIZED(m_widget))
- {
- gtk_widget_realize( list_item );
- gtk_widget_realize( GTK_BIN(list_item)->child );
+ if ( m_clientDataList.GetCount() < GetCount() )
+ m_clientDataList.Insert( pos, NULL );
+ if ( m_clientObjectList.GetCount() < GetCount() )
+ m_clientObjectList.Insert( pos, NULL );
- ApplyWidgetStyle();
+ AssignNewItemClientData(pos, clientData, i, type);
}
- gtk_widget_show( list_item );
-
- const unsigned int count = GetCount();
-
- if ( m_clientDataList.GetCount() < count )
- m_clientDataList.Insert( pos, (wxObject*) NULL );
- if ( m_clientObjectList.GetCount() < count )
- m_clientObjectList.Insert( pos, (wxObject*) NULL );
+ if ( style )
+ gtk_rc_style_unref( style );
EnableEvents();
InvalidateBestSize();
- return pos;
+ return pos - 1;
}
void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
return node ? node->GetData() : NULL;
}
-void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
- wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
- wxList::compatibility_iterator node = m_clientObjectList.Item( n );
- if (!node) return;
-
- // wxItemContainer already deletes data for us
-
- node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const
-{
- wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
-
- wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-
- return node ? (wxClientData*) node->GetData() : NULL;
-}
-
-void wxComboBox::Clear()
+void wxComboBox::DoClear()
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_clear_items( GTK_LIST(list), 0, (int)GetCount() );
- wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
- while (node)
- {
- wxClientData *cd = (wxClientData*)node->GetData();
- if (cd) delete cd;
- node = node->GetNext();
- }
m_clientObjectList.Clear();
m_clientDataList.Clear();
InvalidateBestSize();
}
-void wxComboBox::Delete(unsigned int n)
+void wxComboBox::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
DisableEvents();
- GList *list = g_list_append( (GList*) NULL, child->data );
+ GList *list = g_list_append( NULL, child->data );
gtk_list_remove_items( listbox, list );
g_list_free( list );
wxList::compatibility_iterator node = m_clientObjectList.Item( n );
if (node)
{
- wxClientData *cd = (wxClientData*)node->GetData();
- if (cd) delete cd;
m_clientObjectList.Erase( node );
}
EnableEvents();
}
-wxString wxComboBox::GetValue() const
+wxString wxComboBox::DoGetValue() const
{
GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) );
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- wxString tmp;
- if (!value.IsNull()) tmp = value;
- gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) );
+ gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( value ) );
InvalidateBestSize();
}
+void wxComboBox::WriteText(const wxString& value)
+{
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+
+ GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+ GtkEditable * const edit = GTK_EDITABLE(entry);
+
+ gtk_editable_delete_selection(edit);
+ gint len = gtk_editable_get_position(edit);
+ gtk_editable_insert_text(edit, wxGTK_CONV(value), -1, &len);
+ gtk_editable_set_position(edit, len);
+}
+
void wxComboBox::Copy()
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
eventEnter.SetInt( GetSelection() );
eventEnter.SetEventObject( this );
- if (!GetEventHandler()->ProcessEvent( eventEnter ))
+ if (!HandleWindowEvent( eventEnter ))
{
// This will invoke the dialog default action, such
// as the clicking the default button.
projects / wxWidgets.git / blobdiff