void wxChoice::Init()
{
- m_strings = (wxSortedArrayString *)NULL;
+ m_strings = NULL;
m_stringCellIndex = 0;
}
{
// if our m_strings != NULL, Append() will check for it and insert
// items in the correct order
- m_strings = new wxSortedArrayString;
+ m_strings = new wxGtkCollatedArrayString;
}
m_widget = gtk_combo_box_new_text();
+ g_object_ref(m_widget);
Append(n, choices);
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid control") );
wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
- _T("In a sorted choice data could only be appended"));
+ wxT("In a sorted choice data could only be appended"));
const int count = items.GetCount();
n = pos + i;
// If sorted, use this wxSortedArrayStrings to determine
// the right insertion point
- if(m_strings)
+ if (m_strings)
n = m_strings->Add(items[i]);
GTKInsertComboBoxTextItem( n, items[i] );
{
wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
- DisableEvents();
+ GTKDisableEvents();
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
GtkTreeModel* model = gtk_combo_box_get_model( combobox );
if (m_strings)
m_strings->Clear();
- EnableEvents();
+ GTKEnableEvents();
InvalidateBestSize();
}
void wxChoice::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
- wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") );
+ wxCHECK_RET( IsValid(n), wxT("invalid index in wxChoice::Delete") );
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
GtkTreeModel* model = gtk_combo_box_get_model( combobox );
{
wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
- DisableEvents();
+ GTKDisableEvents();
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
gtk_combo_box_set_active( combobox, n );
- EnableEvents();
+ GTKEnableEvents();
}
void wxChoice::SetColumns(int n)
}
-void wxChoice::DisableEvents()
+void wxChoice::GTKDisableEvents()
{
g_signal_handlers_block_by_func(m_widget,
(gpointer) gtk_choice_changed_callback, this);
}
-void wxChoice::EnableEvents()
+void wxChoice::GTKEnableEvents()
{
g_signal_handlers_unblock_by_func(m_widget,
(gpointer) gtk_choice_changed_callback, this);
// in the combobox
if ( m_widget )
{
- ret.x = 60; // start with something "sensible"
+ ret.x = GetCount() > 0 ? 0 : 60; // start with something "sensible"
int width;
unsigned int count = GetCount();
for ( unsigned int n = 0; n < count; n++ )