X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1abca322fd7a9a7abe6cc0b144987786faa0f05..ae51cebbe62f759cdee2f4548249393472b7baa5:/src/gtk/combobox.cpp diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 1a10d9b366..00792deb14 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -242,7 +242,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, const wxString& name ) { m_ignoreNextUpdate = false; - m_needParent = true; m_prevSelection = 0; if (!PreCreation( parent, pos, size ) || @@ -426,9 +425,9 @@ int wxComboBox::DoAppend( const wxString &item ) GtkRcStyle *style = CreateWidgetStyle(); if (style) { - gtk_widget_modify_style( GTK_WIDGET( list_item ), style ); + gtk_widget_modify_style(list_item, style); GtkBin *bin = GTK_BIN( list_item ); - GtkWidget *label = GTK_WIDGET( bin->child ); + GtkWidget *label = bin->child; gtk_widget_modify_style( label, style ); gtk_rc_style_unref( style ); } @@ -947,7 +946,10 @@ void wxComboBox::SetValue( const wxString& value ) wxString tmp; if (!value.IsNull()) tmp = value; + + DisableEvents(); gtk_entry_set_text( entry, wxGTK_CONV( tmp ) ); + EnableEvents(); InvalidateBestSize(); }