GtkWidget *list = GTK_COMBO(m_widget)->list;
#ifndef __WXGTK20__
- gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
+ // gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
#endif
for (int i = 0; i < n; i++)
m_clientDataList.Clear();
}
+void wxComboBox::SetFocus()
+{
+ if ( m_hasFocus )
+ {
+ // don't do anything if we already have focus
+ return;
+ }
+
+ gtk_widget_grab_focus( m_focusWidget );
+}
+
void wxComboBox::AppendCommon( const wxString &item )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
{
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
- if (item == wxString(label->label,*wxConvCurrent))
+#ifdef __WXGTK20__
+ wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+#else
+ wxString str( label->label );
+#endif
+ if (item == str)
return count;
+
count++;
child = child->next;
}
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
#ifdef __WXGTK20__
- str = wxGTK_CONV_BACK( gtk_label_get_text( label) );
+ str = wxGTK_CONV_BACK( gtk_label_get_text(label) );
#else
str = wxString( label->label );
#endif
if (selection)
{
GtkBin *bin = GTK_BIN( selection->data );
- wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent);
+ GtkLabel *label = GTK_LABEL( bin->child );
+#ifdef __WXGTK20__
+ wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+#else
+ wxString tmp( label->label );
+#endif
return tmp;
}