diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-12-11 05:25:02 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-12-11 05:25:02 +0000 |
| commit | 731f230c24529fbef382a84ec5a2d0db58eaec76 (patch) | |
| tree | fed6d664b1d1164cc9f37e876251c6a7611ec37b | |
| parent | f3a74ace5f69840657813cd68f441ceadea671e8 (diff) | |
| download | gtk+-731f230c24529fbef382a84ec5a2d0db58eaec76.tar.gz | |
Only wrap if we are in the topmost menu. (#160936, John Finlay)
2004-12-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level)
(gtk_combo_box_menu_row_changed): Only wrap if we are in the
topmost menu. (#160936, John Finlay)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkcombobox.c | 5 |
5 files changed, 27 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2004-12-11 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) + (gtk_combo_box_menu_row_changed): Only wrap if we are in the + topmost menu. (#160936, John Finlay) + 2004-12-10 Matthias Clasen <mclasen@redhat.com> Support no-Alt mnemnonics in menu bars (#101309, Owen Taylor) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7d21818a20..651b0b6f3e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-12-11 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) + (gtk_combo_box_menu_row_changed): Only wrap if we are in the + topmost menu. (#160936, John Finlay) + 2004-12-10 Matthias Clasen <mclasen@redhat.com> Support no-Alt mnemnonics in menu bars (#101309, Owen Taylor) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7d21818a20..651b0b6f3e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-12-11 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) + (gtk_combo_box_menu_row_changed): Only wrap if we are in the + topmost menu. (#160936, John Finlay) + 2004-12-10 Matthias Clasen <mclasen@redhat.com> Support no-Alt mnemnonics in menu bars (#101309, Owen Taylor) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7d21818a20..651b0b6f3e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-12-11 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkcombobox.c (gtk_combo_box_menu_fill_level) + (gtk_combo_box_menu_row_changed): Only wrap if we are in the + topmost menu. (#160936, John Finlay) + 2004-12-10 Matthias Clasen <mclasen@redhat.com> Support no-Alt mnemnonics in menu bars (#101309, Owen Taylor) diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 60f5c5bd5c..0d349037cf 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -2502,7 +2502,7 @@ gtk_combo_box_menu_fill_level (GtkComboBox *combo_box, } gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - if (combo_box->priv->wrap_width) + if (combo_box->priv->wrap_width && menu == combo_box->priv->popup_widget) gtk_combo_box_relayout_item (combo_box, item, &iter, last); gtk_widget_show (item); @@ -3054,7 +3054,8 @@ gtk_combo_box_menu_row_changed (GtkTreeModel *model, gtk_combo_box_menu_row_inserted (model, path, iter, combo_box); } - if (combo_box->priv->wrap_width) + if (combo_box->priv->wrap_width + && item->parent == combo_box->priv->popup_widget) gtk_combo_box_relayout_item (combo_box, item, iter, NULL); width = gtk_combo_box_calc_requested_width (combo_box, path); |