diff --git a/ChangeLog b/ChangeLog index 3b22d214d7..a6cad6a487 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gdk/gdk.h gdk/gdkfont.c: Added gdk_text/string_extents() - - too calculate all the metrics at once of a string, including + to calculate all the metrics at once of a string, including things which weren't calculated before. * gtk/Makefile.am gtk/gtk.h gtk/gtktearoffmenu.[ch]: New @@ -16,10 +16,11 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gtk/gtkitemfactory.c: - Create a AccelGroup for each MenuShell we create. - - If an '&' appears before a character 'c' in the path, + - If an '_' appears before a character 'c' in the path, then make 'c' an accelerator in the menu's accel group, and if the menuitem is menubar C an accelerator - in the itemfactory's accel group. + in the itemfactory's accel group. Double '__' inserts + a literal '_' * gtk/gtklabel.[ch]: Add support for a pattern arg - which is a string. If an '_' appears in this string, @@ -118,7 +119,6 @@ Thu Aug 6 22:37:21 1998 Stefan Jeske * gtk/gtkclist.c: Renamed my_merge and my_mergesort to gtk_clist_merge and gtk_clist_mergesort. :) ->>>>>>> 1.579 1998-08-06 Martin Baulig * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3b22d214d7..a6cad6a487 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,7 +1,7 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gdk/gdk.h gdk/gdkfont.c: Added gdk_text/string_extents() - - too calculate all the metrics at once of a string, including + to calculate all the metrics at once of a string, including things which weren't calculated before. * gtk/Makefile.am gtk/gtk.h gtk/gtktearoffmenu.[ch]: New @@ -16,10 +16,11 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gtk/gtkitemfactory.c: - Create a AccelGroup for each MenuShell we create. - - If an '&' appears before a character 'c' in the path, + - If an '_' appears before a character 'c' in the path, then make 'c' an accelerator in the menu's accel group, and if the menuitem is menubar C an accelerator - in the itemfactory's accel group. + in the itemfactory's accel group. Double '__' inserts + a literal '_' * gtk/gtklabel.[ch]: Add support for a pattern arg - which is a string. If an '_' appears in this string, @@ -118,7 +119,6 @@ Thu Aug 6 22:37:21 1998 Stefan Jeske * gtk/gtkclist.c: Renamed my_merge and my_mergesort to gtk_clist_merge and gtk_clist_mergesort. :) ->>>>>>> 1.579 1998-08-06 Martin Baulig * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3b22d214d7..a6cad6a487 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,7 +1,7 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gdk/gdk.h gdk/gdkfont.c: Added gdk_text/string_extents() - - too calculate all the metrics at once of a string, including + to calculate all the metrics at once of a string, including things which weren't calculated before. * gtk/Makefile.am gtk/gtk.h gtk/gtktearoffmenu.[ch]: New @@ -16,10 +16,11 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gtk/gtkitemfactory.c: - Create a AccelGroup for each MenuShell we create. - - If an '&' appears before a character 'c' in the path, + - If an '_' appears before a character 'c' in the path, then make 'c' an accelerator in the menu's accel group, and if the menuitem is menubar C an accelerator - in the itemfactory's accel group. + in the itemfactory's accel group. Double '__' inserts + a literal '_' * gtk/gtklabel.[ch]: Add support for a pattern arg - which is a string. If an '_' appears in this string, @@ -118,7 +119,6 @@ Thu Aug 6 22:37:21 1998 Stefan Jeske * gtk/gtkclist.c: Renamed my_merge and my_mergesort to gtk_clist_merge and gtk_clist_mergesort. :) ->>>>>>> 1.579 1998-08-06 Martin Baulig * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3b22d214d7..a6cad6a487 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,7 +1,7 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gdk/gdk.h gdk/gdkfont.c: Added gdk_text/string_extents() - - too calculate all the metrics at once of a string, including + to calculate all the metrics at once of a string, including things which weren't calculated before. * gtk/Makefile.am gtk/gtk.h gtk/gtktearoffmenu.[ch]: New @@ -16,10 +16,11 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gtk/gtkitemfactory.c: - Create a AccelGroup for each MenuShell we create. - - If an '&' appears before a character 'c' in the path, + - If an '_' appears before a character 'c' in the path, then make 'c' an accelerator in the menu's accel group, and if the menuitem is menubar C an accelerator - in the itemfactory's accel group. + in the itemfactory's accel group. Double '__' inserts + a literal '_' * gtk/gtklabel.[ch]: Add support for a pattern arg - which is a string. If an '_' appears in this string, @@ -118,7 +119,6 @@ Thu Aug 6 22:37:21 1998 Stefan Jeske * gtk/gtkclist.c: Renamed my_merge and my_mergesort to gtk_clist_merge and gtk_clist_mergesort. :) ->>>>>>> 1.579 1998-08-06 Martin Baulig * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3b22d214d7..a6cad6a487 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,7 +1,7 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gdk/gdk.h gdk/gdkfont.c: Added gdk_text/string_extents() - - too calculate all the metrics at once of a string, including + to calculate all the metrics at once of a string, including things which weren't calculated before. * gtk/Makefile.am gtk/gtk.h gtk/gtktearoffmenu.[ch]: New @@ -16,10 +16,11 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gtk/gtkitemfactory.c: - Create a AccelGroup for each MenuShell we create. - - If an '&' appears before a character 'c' in the path, + - If an '_' appears before a character 'c' in the path, then make 'c' an accelerator in the menu's accel group, and if the menuitem is menubar C an accelerator - in the itemfactory's accel group. + in the itemfactory's accel group. Double '__' inserts + a literal '_' * gtk/gtklabel.[ch]: Add support for a pattern arg - which is a string. If an '_' appears in this string, @@ -118,7 +119,6 @@ Thu Aug 6 22:37:21 1998 Stefan Jeske * gtk/gtkclist.c: Renamed my_merge and my_mergesort to gtk_clist_merge and gtk_clist_mergesort. :) ->>>>>>> 1.579 1998-08-06 Martin Baulig * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3b22d214d7..a6cad6a487 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,7 +1,7 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gdk/gdk.h gdk/gdkfont.c: Added gdk_text/string_extents() - - too calculate all the metrics at once of a string, including + to calculate all the metrics at once of a string, including things which weren't calculated before. * gtk/Makefile.am gtk/gtk.h gtk/gtktearoffmenu.[ch]: New @@ -16,10 +16,11 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gtk/gtkitemfactory.c: - Create a AccelGroup for each MenuShell we create. - - If an '&' appears before a character 'c' in the path, + - If an '_' appears before a character 'c' in the path, then make 'c' an accelerator in the menu's accel group, and if the menuitem is menubar C an accelerator - in the itemfactory's accel group. + in the itemfactory's accel group. Double '__' inserts + a literal '_' * gtk/gtklabel.[ch]: Add support for a pattern arg - which is a string. If an '_' appears in this string, @@ -118,7 +119,6 @@ Thu Aug 6 22:37:21 1998 Stefan Jeske * gtk/gtkclist.c: Renamed my_merge and my_mergesort to gtk_clist_merge and gtk_clist_mergesort. :) ->>>>>>> 1.579 1998-08-06 Martin Baulig * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3b22d214d7..a6cad6a487 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,7 +1,7 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gdk/gdk.h gdk/gdkfont.c: Added gdk_text/string_extents() - - too calculate all the metrics at once of a string, including + to calculate all the metrics at once of a string, including things which weren't calculated before. * gtk/Makefile.am gtk/gtk.h gtk/gtktearoffmenu.[ch]: New @@ -16,10 +16,11 @@ Tue Jul 21 12:42:01 1998 Owen Taylor * gtk/gtkitemfactory.c: - Create a AccelGroup for each MenuShell we create. - - If an '&' appears before a character 'c' in the path, + - If an '_' appears before a character 'c' in the path, then make 'c' an accelerator in the menu's accel group, and if the menuitem is menubar C an accelerator - in the itemfactory's accel group. + in the itemfactory's accel group. Double '__' inserts + a literal '_' * gtk/gtklabel.[ch]: Add support for a pattern arg - which is a string. If an '_' appears in this string, @@ -118,7 +119,6 @@ Thu Aug 6 22:37:21 1998 Stefan Jeske * gtk/gtkclist.c: Renamed my_merge and my_mergesort to gtk_clist_merge and gtk_clist_mergesort. :) ->>>>>>> 1.579 1998-08-06 Martin Baulig * gtk/gtkclist.c: Renamed `merge' -> `my_merge' and