[gtk+/gtk-2.16: 6/7] Don't force toggle size for tabular menus either

[Matthias Clasen <matthiasc src gnome org>]

commit e07a80c7efe167ab46b82d8c31e42d19c717e8f0
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jun 22 10:00:19 2009 -0400

    Don't force toggle size for tabular menus either

 gtk/gtkmenu.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index f67f390..49d2e23 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2431,9 +2431,14 @@ gtk_menu_size_request (GtkWidget      *widget,
        priv->heights[t] = MAX (priv->heights[t], part);
     }
 
-  /* if the menu doesn't include any images or check items
-   * reserve the space so that all menus are consistent */
-  if (max_toggle_size == 0 && !priv->no_toggle_size)
+  /* If the menu doesn't include any images or check items
+   * reserve the space so that all menus are consistent.
+   * We only do this for 'ordinary' menus, not for combobox
+   * menus or multi-column menus
+   */
+  if (max_toggle_size == 0 && 
+      gtk_menu_get_n_columns (menu) == 1 &&
+      !priv->no_toggle_size)
     {
       guint toggle_spacing;
       guint indicator_size;