зеркало из https://github.com/mozilla/gecko-dev.git
we don't need the mAlign thing anymore since we have an event box
This commit is contained in:
Родитель
04cadf7b10
Коммит
4ea5e9dd8d
|
@ -304,20 +304,15 @@ nsresult nsComboBox::QueryInterface(const nsIID& aIID, void** aInstancePtr)
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
NS_METHOD nsComboBox::CreateNative(GtkWidget *parentWindow)
|
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();
|
mWidget = ::gtk_event_box_new();
|
||||||
|
|
||||||
mAlign = ::gtk_alignment_new(1.0,1.0,1.0,1.0);
|
|
||||||
::gtk_widget_set_name(mWidget, "nsComboBox");
|
::gtk_widget_set_name(mWidget, "nsComboBox");
|
||||||
mCombo = ::gtk_combo_new();
|
mCombo = ::gtk_combo_new();
|
||||||
gtk_widget_show(mCombo);
|
gtk_widget_show(mCombo);
|
||||||
gtk_widget_show(mAlign);
|
|
||||||
/* make the stuff uneditable */
|
/* make the stuff uneditable */
|
||||||
gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(mCombo)->entry), PR_FALSE);
|
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),
|
gtk_signal_connect(GTK_OBJECT(mCombo),
|
||||||
"destroy",
|
"destroy",
|
||||||
GTK_SIGNAL_FUNC(DestroySignal),
|
GTK_SIGNAL_FUNC(DestroySignal),
|
||||||
|
@ -327,7 +322,7 @@ NS_METHOD nsComboBox::CreateNative(GtkWidget *parentWindow)
|
||||||
GTK_SIGNAL_FUNC(UnmapSignal),
|
GTK_SIGNAL_FUNC(UnmapSignal),
|
||||||
this);
|
this);
|
||||||
|
|
||||||
gtk_container_add(GTK_CONTAINER(mWidget), mAlign);
|
gtk_container_add(GTK_CONTAINER(mWidget), mCombo);
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,8 +66,6 @@ protected:
|
||||||
virtual void OnUnmapSignal(GtkWidget* aWidget);
|
virtual void OnUnmapSignal(GtkWidget* aWidget);
|
||||||
static gint UnmapSignal(GtkWidget* aGtkWidget, nsComboBox* aCombo);
|
static gint UnmapSignal(GtkWidget* aGtkWidget, nsComboBox* aCombo);
|
||||||
|
|
||||||
|
|
||||||
GtkWidget *mAlign; /* workaround for gtkcombo bug */
|
|
||||||
GtkWidget *mCombo; /* workaround for gtkcombo bug */
|
GtkWidget *mCombo; /* workaround for gtkcombo bug */
|
||||||
GList *mItems;
|
GList *mItems;
|
||||||
PRBool mMultiSelect;
|
PRBool mMultiSelect;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче