diff --git a/ChangeLog b/ChangeLog index 662430b1b..932f78b60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Fri Mar 20 20:49:33 1998 Radek Doulik + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing + in toolbar elements, so texts are always at the bottom + +Wed Mar 18 01:07:11 1998 Radek Doulik + + * gtk/gtkclist.c (gtk_clist_column_titles_show): test if + clist->title_window exists before showing it, + gtk_clist_column_titles_hide also fixed + Thu Mar 19 16:40:47 PST 1998 Shawn T. Amundson * Released GTK+ 0.99.8 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 662430b1b..932f78b60 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Fri Mar 20 20:49:33 1998 Radek Doulik + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing + in toolbar elements, so texts are always at the bottom + +Wed Mar 18 01:07:11 1998 Radek Doulik + + * gtk/gtkclist.c (gtk_clist_column_titles_show): test if + clist->title_window exists before showing it, + gtk_clist_column_titles_hide also fixed + Thu Mar 19 16:40:47 PST 1998 Shawn T. Amundson * Released GTK+ 0.99.8 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 662430b1b..932f78b60 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Fri Mar 20 20:49:33 1998 Radek Doulik + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing + in toolbar elements, so texts are always at the bottom + +Wed Mar 18 01:07:11 1998 Radek Doulik + + * gtk/gtkclist.c (gtk_clist_column_titles_show): test if + clist->title_window exists before showing it, + gtk_clist_column_titles_hide also fixed + Thu Mar 19 16:40:47 PST 1998 Shawn T. Amundson * Released GTK+ 0.99.8 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 662430b1b..932f78b60 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Fri Mar 20 20:49:33 1998 Radek Doulik + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing + in toolbar elements, so texts are always at the bottom + +Wed Mar 18 01:07:11 1998 Radek Doulik + + * gtk/gtkclist.c (gtk_clist_column_titles_show): test if + clist->title_window exists before showing it, + gtk_clist_column_titles_hide also fixed + Thu Mar 19 16:40:47 PST 1998 Shawn T. Amundson * Released GTK+ 0.99.8 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 662430b1b..932f78b60 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Fri Mar 20 20:49:33 1998 Radek Doulik + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing + in toolbar elements, so texts are always at the bottom + +Wed Mar 18 01:07:11 1998 Radek Doulik + + * gtk/gtkclist.c (gtk_clist_column_titles_show): test if + clist->title_window exists before showing it, + gtk_clist_column_titles_hide also fixed + Thu Mar 19 16:40:47 PST 1998 Shawn T. Amundson * Released GTK+ 0.99.8 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 662430b1b..932f78b60 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Fri Mar 20 20:49:33 1998 Radek Doulik + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing + in toolbar elements, so texts are always at the bottom + +Wed Mar 18 01:07:11 1998 Radek Doulik + + * gtk/gtkclist.c (gtk_clist_column_titles_show): test if + clist->title_window exists before showing it, + gtk_clist_column_titles_hide also fixed + Thu Mar 19 16:40:47 PST 1998 Shawn T. Amundson * Released GTK+ 0.99.8 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 662430b1b..932f78b60 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Fri Mar 20 20:49:33 1998 Radek Doulik + + * gtk/gtktoolbar.c (gtk_toolbar_insert_element): changed packing + in toolbar elements, so texts are always at the bottom + +Wed Mar 18 01:07:11 1998 Radek Doulik + + * gtk/gtkclist.c (gtk_clist_column_titles_show): test if + clist->title_window exists before showing it, + gtk_clist_column_titles_hide also fixed + Thu Mar 19 16:40:47 PST 1998 Shawn T. Amundson * Released GTK+ 0.99.8 diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index f22f59a2f..f11a80779 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -787,22 +787,22 @@ gtk_toolbar_insert_element (GtkToolbar *toolbar, gtk_container_add (GTK_CONTAINER (child->widget), vbox); gtk_widget_show (vbox); - if (icon) - { - child->icon = GTK_WIDGET (icon); - gtk_box_pack_start (GTK_BOX (vbox), child->icon, FALSE, FALSE, 0); - if (toolbar->style != GTK_TOOLBAR_TEXT) - gtk_widget_show (child->icon); - } - if (text) { child->label = gtk_label_new (text); - gtk_box_pack_start (GTK_BOX (vbox), child->label, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (vbox), child->label, FALSE, FALSE, 0); if (toolbar->style != GTK_TOOLBAR_ICONS) gtk_widget_show (child->label); } + if (icon) + { + child->icon = GTK_WIDGET (icon); + gtk_box_pack_end (GTK_BOX (vbox), child->icon, FALSE, FALSE, 0); + if (toolbar->style != GTK_TOOLBAR_TEXT) + gtk_widget_show (child->icon); + } + gtk_widget_show (child->widget); break;