From bf910884ccd3b3fb0655799feee83adcbc35a3a9 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 18 Oct 2004 20:22:25 +0000 Subject: Documentation updates (STR #570) Added DESTDIR support and now remove all man pages for the "uninstall" target (STR #545) Fix PNG drawing on buggy WIN32 graphics cards (STR #548) The configure script didn't propagate the CPPFLAGS environment variable (STR #549) The numpad keys didn't work properly on WIN32 (STR #502) fl_input() and friends now set the input focus to the text field when the dialog is shown (STR #553) Fixed background color mixup when drawing Fl_Choice menus (STR #544) Fixed MingW makefiles (STR #550) More VC++ project file tweaking (STR #559) Fl_PNG_Image didn't use the png_set_trns_to_alpha function when available (STR #547) The FL_UNFOCUS event wasn't always sent when switching tabs (STR #558) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3868 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Menu.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Fl_Menu.cxx') diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 7a62f0a2d..3d0359af2 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.33 2004/07/26 20:52:51 easysw Exp $" +// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.34 2004/10/18 20:22:23 easysw Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -378,7 +378,7 @@ void menutitle::draw() { void menuwindow::draw() { if (damage() != FL_DAMAGE_CHILD) { // complete redraw - fl_draw_box(box(), 0, 0, w(), h(), color()); + fl_draw_box(box(), 0, 0, w(), h(), button ? button->color() : color()); if (menu) { const Fl_Menu_Item* m; int j; for (m=menu->first(), j=0; m->text; j++, m = m->next()) drawentry(m, j, 0); @@ -791,5 +791,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.33 2004/07/26 20:52:51 easysw Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.34 2004/10/18 20:22:23 easysw Exp $". // -- cgit v1.2.3