diff --git a/mozilla/widget/src/gtk/nsComboBox.cpp b/mozilla/widget/src/gtk/nsComboBox.cpp index e322783acb6..6402bac0ed6 100644 --- a/mozilla/widget/src/gtk/nsComboBox.cpp +++ b/mozilla/widget/src/gtk/nsComboBox.cpp @@ -304,20 +304,15 @@ nsresult nsComboBox::QueryInterface(const nsIID& aIID, void** aInstancePtr) //------------------------------------------------------------------------- NS_METHOD nsComboBox::CreateNative(GtkWidget *parentWindow) { -/* there is a bug in gtkcombo - add it inside an alignment set the usize on it.. - (set xscale yscale for the alignment to 1.0) -*/ mWidget = ::gtk_event_box_new(); - mAlign = ::gtk_alignment_new(1.0,1.0,1.0,1.0); ::gtk_widget_set_name(mWidget, "nsComboBox"); mCombo = ::gtk_combo_new(); gtk_widget_show(mCombo); - gtk_widget_show(mAlign); + /* make the stuff uneditable */ gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(mCombo)->entry), PR_FALSE); - gtk_container_add(GTK_CONTAINER(mAlign), mCombo); + gtk_signal_connect(GTK_OBJECT(mCombo), "destroy", GTK_SIGNAL_FUNC(DestroySignal), @@ -327,7 +322,7 @@ NS_METHOD nsComboBox::CreateNative(GtkWidget *parentWindow) GTK_SIGNAL_FUNC(UnmapSignal), this); - gtk_container_add(GTK_CONTAINER(mWidget), mAlign); + gtk_container_add(GTK_CONTAINER(mWidget), mCombo); return NS_OK; } diff --git a/mozilla/widget/src/gtk/nsComboBox.h b/mozilla/widget/src/gtk/nsComboBox.h index 4e3a865073e..8d7079af4bb 100644 --- a/mozilla/widget/src/gtk/nsComboBox.h +++ b/mozilla/widget/src/gtk/nsComboBox.h @@ -66,8 +66,6 @@ protected: virtual void OnUnmapSignal(GtkWidget* aWidget); static gint UnmapSignal(GtkWidget* aGtkWidget, nsComboBox* aCombo); - - GtkWidget *mAlign; /* workaround for gtkcombo bug */ GtkWidget *mCombo; /* workaround for gtkcombo bug */ GList *mItems; PRBool mMultiSelect;