aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorOlivier Abad <oabad@noos.fr>2003-10-17 06:06:04 +0000
committerOlivier Abad <oabad@noos.fr>2003-10-17 06:06:04 +0000
commit121f855b6c7878e143a2aa341be9b9d651049586 (patch)
treea59c91241e0bdab2a262218c5fbf7c1557b69da5 /gtk
parentee5c9ff5b8d63a2d57b899e8293d5ef21edd3bdc (diff)
Change the comments about toolbar elements resizing as it is not
necessary in GTK+ 2.x svn path=/trunk/; revision=8721
Diffstat (limited to 'gtk')
-rw-r--r--gtk/toolbar.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 20284a2a8c..76255c529e 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -2,7 +2,7 @@
* The main toolbar
* Copyright 2003, Ulf Lamping <ulf.lamping@web.de>
*
- * $Id: toolbar.c,v 1.6 2003/10/16 21:19:12 guy Exp $
+ * $Id: toolbar.c,v 1.7 2003/10/17 06:06:04 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -162,15 +162,12 @@ toolbar_redraw_all(void)
gtk_widget_hide(main_tb_hb);
}
- /* resize ALL elements in the top_level container */
-#if GTK_MAJOR_VERSION >= 2
- /* XXX - do this on GTK+ 2.x as well? If we don't do it in 1.2[.x],
- the toolbar takes the maximum vertical size it ever had, even
- if you change the style in such a way as to reduce its height. */
-#if 0
- gtk_container_resize_children(GTK_CONTAINER(top_level));
-#endif
-#else
+ /* resize ALL elements in the top_level container (not necessary in GTK+
+ * 2.x) */
+#if GTK_MAJOR_VERSION < 2
+ /* If we don't do it in 1.2[.x], the toolbar takes the maximum vertical size
+ * it ever had, even if you change the style in such a way as to reduce its
+ * height. */
gtk_container_queue_resize(GTK_CONTAINER(top_level));
#endif
}