From d536cdde0294a2bb25b1cbcc4477de9dfd75bb25 Mon Sep 17 00:00:00 2001 From: cinamod Date: Fri, 29 Aug 2003 22:45:18 +0000 Subject: [PATCH] some tooltips work -waiting for gtk 2.4 --- modules/engines/ms-windows/ChangeLog.old | 2 +- modules/engines/ms-windows/wimp_style.c | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old index 0e67e9043e..747b7d6fc3 100755 --- a/modules/engines/ms-windows/ChangeLog.old +++ b/modules/engines/ms-windows/ChangeLog.old @@ -1,7 +1,7 @@ 2003-08-29 Dom Lachowicz * src/*.c: Theme GTK toolbar arrows to XP chevrons, once my GTK patch is committed. - * src/wimp_style.c: Enable proper fonts/sizes for menus, status bars. Tooltips are giving me grief, though. + * src/wimp_style.c: Enable proper fonts/sizes for menus, status bars. Tooltips are waiting for my GTK patches, though. 2003-08-28 Dom Lachowicz diff --git a/modules/engines/ms-windows/wimp_style.c b/modules/engines/ms-windows/wimp_style.c index 01ad3f3969..41bd1bef27 100755 --- a/modules/engines/ms-windows/wimp_style.c +++ b/modules/engines/ms-windows/wimp_style.c @@ -305,24 +305,22 @@ setup_system_styles(GtkStyle *style) (font_ptr ? font_ptr : " font name should go here")); gtk_rc_parse_string(buf); -#if 0 - /* enable tooltip fonts */ + /* enable tooltip fonts - waiting for GTK 2.4 */ font_ptr = sys_font_to_pango_font (CAPTION_FONT,font_buf); - sprintf(buf, "style \"wimp-tooltip-font\"\n" - "{%s = \"%s\"\n" - "}widget_class \"*GtkWindow.GtkLabel*\" style \"wimp-tooltip-font\"\n", + sprintf(buf, "style \"wimp-tooltips-caption\"\n" + "{fg[NORMAL] = { %d, %d, %d }\n" + "%s = \"%s\"\n" + "}widget \"gtk-tooltips-caption*\" style \"wimp-tooltips-caption\"\n", + tooltip_fore.red, + tooltip_fore.green, + tooltip_fore.blue, (font_ptr ? "font_name" : "#"), (font_ptr ? font_ptr : " font name should go here")); gtk_rc_parse_string(buf); -#endif sprintf(buf, "style \"wimp-tooltips\"\n" - "{fg[NORMAL] = { %d, %d, %d }\n" - "bg[NORMAL] = { %d, %d, %d }\n" + {"bg[NORMAL] = { %d, %d, %d }\n" "}widget \"gtk-tooltips*\" style \"wimp-tooltips\"\n", - tooltip_fore.red, - tooltip_fore.green, - tooltip_fore.blue, tooltip_back.red, tooltip_back.green, tooltip_back.blue); @@ -846,6 +844,7 @@ draw_arrow (GtkStyle *style, } else { + /* draw the toolbar chevrons - waiting for GTK 2.4 */ if (name && !strcmp (name, "gtk-toolbar-arrow")) { if (xp_theme_draw(window, XP_THEME_ELEMENT_CHEVRON, style, x, y, width, height, state)) -- GitLab