diff --git a/ChangeLog b/ChangeLog index 33bbe5c026..06a1169099 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 3 20:51:23 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the al lowed + values and default value for the ::active property. (#143669, + Olivier Andrieu) + 2004-06-03 Michael Natterer Merged from HEAD: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 33bbe5c026..06a1169099 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Jun 3 20:51:23 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the al lowed + values and default value for the ::active property. (#143669, + Olivier Andrieu) + 2004-06-03 Michael Natterer Merged from HEAD: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 33bbe5c026..06a1169099 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Jun 3 20:51:23 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the al lowed + values and default value for the ::active property. (#143669, + Olivier Andrieu) + 2004-06-03 Michael Natterer Merged from HEAD: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 33bbe5c026..06a1169099 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Jun 3 20:51:23 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the al lowed + values and default value for the ::active property. (#143669, + Olivier Andrieu) + 2004-06-03 Michael Natterer Merged from HEAD: diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 236a1b7966..cf1629a1dd 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -501,9 +501,9 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass) g_param_spec_int ("active", P_("Active item"), P_("The item which is currently active"), - 0, + -1, G_MAXINT, - 0, + -1, G_PARAM_READWRITE)); gtk_widget_class_install_style_property (widget_class,