diff --git a/ChangeLog b/ChangeLog index c20cf995b5..2838a8d47a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Feb 1 19:57:59 2002 Owen Taylor + + * configure.in: Fix use of ! in shell. + + * gtk/gtktooltips.c (gtk_tooltips_class_init) gtkrc.default: + Move the setting of default tooltips colors to gtktooltips.c + from gtkrc.default. (Use default priority so themes will + override.) (#58542) + Fri Feb 1 17:48:51 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_get_style): Fix ordering of diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c20cf995b5..2838a8d47a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Fri Feb 1 19:57:59 2002 Owen Taylor + + * configure.in: Fix use of ! in shell. + + * gtk/gtktooltips.c (gtk_tooltips_class_init) gtkrc.default: + Move the setting of default tooltips colors to gtktooltips.c + from gtkrc.default. (Use default priority so themes will + override.) (#58542) + Fri Feb 1 17:48:51 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_get_style): Fix ordering of diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c20cf995b5..2838a8d47a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Fri Feb 1 19:57:59 2002 Owen Taylor + + * configure.in: Fix use of ! in shell. + + * gtk/gtktooltips.c (gtk_tooltips_class_init) gtkrc.default: + Move the setting of default tooltips colors to gtktooltips.c + from gtkrc.default. (Use default priority so themes will + override.) (#58542) + Fri Feb 1 17:48:51 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_get_style): Fix ordering of diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c20cf995b5..2838a8d47a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Fri Feb 1 19:57:59 2002 Owen Taylor + + * configure.in: Fix use of ! in shell. + + * gtk/gtktooltips.c (gtk_tooltips_class_init) gtkrc.default: + Move the setting of default tooltips colors to gtktooltips.c + from gtkrc.default. (Use default priority so themes will + override.) (#58542) + Fri Feb 1 17:48:51 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_get_style): Fix ordering of diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c20cf995b5..2838a8d47a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Fri Feb 1 19:57:59 2002 Owen Taylor + + * configure.in: Fix use of ! in shell. + + * gtk/gtktooltips.c (gtk_tooltips_class_init) gtkrc.default: + Move the setting of default tooltips colors to gtktooltips.c + from gtkrc.default. (Use default priority so themes will + override.) (#58542) + Fri Feb 1 17:48:51 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_get_style): Fix ordering of diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c20cf995b5..2838a8d47a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Fri Feb 1 19:57:59 2002 Owen Taylor + + * configure.in: Fix use of ! in shell. + + * gtk/gtktooltips.c (gtk_tooltips_class_init) gtkrc.default: + Move the setting of default tooltips colors to gtktooltips.c + from gtkrc.default. (Use default priority so themes will + override.) (#58542) + Fri Feb 1 17:48:51 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_get_style): Fix ordering of diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c20cf995b5..2838a8d47a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Fri Feb 1 19:57:59 2002 Owen Taylor + + * configure.in: Fix use of ! in shell. + + * gtk/gtktooltips.c (gtk_tooltips_class_init) gtkrc.default: + Move the setting of default tooltips colors to gtktooltips.c + from gtkrc.default. (Use default priority so themes will + override.) (#58542) + Fri Feb 1 17:48:51 2002 Owen Taylor * gtk/gtkrc.c (gtk_rc_get_style): Fix ordering of diff --git a/gtk/gtkrc.default b/gtk/gtkrc.default index 9971dbd519..c66bc131b5 100644 --- a/gtk/gtkrc.default +++ b/gtk/gtkrc.default @@ -1,9 +1,3 @@ # # This theme is the default theme if no other theme is selected. # -style "gtk-default-tooltips-style" { - bg[NORMAL] = "#ffffc0" - fg[NORMAL] = "#000000" -} - -widget "gtk-tooltips" style "gtk-default-tooltips-style" diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c index 7ba764cbc9..8b609a6ca8 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -99,6 +99,13 @@ gtk_tooltips_class_init (GtkTooltipsClass *class) parent_class = gtk_type_class (GTK_TYPE_OBJECT); object_class->destroy = gtk_tooltips_destroy; + + gtk_rc_parse_string ("style \"gtk-default-tooltips-style\" {\n" + " bg[NORMAL] = \"#ffffc0\"\n" + " fg[NORMAL] = \"#000000\"\n" + "}\n" + "\n" + "widget \"gtk-tooltips*\" style : gtk \"gtk-default-tooltips-style\"\n"); } static void