Flip the color of Fl_Choice to FL_BACKGROUND2_COLOR when there is no

scheme so the menu uses the same color as the background.

Add -Dname[=value] documentation to fltk-config man page.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5485 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2006-09-24 13:35:23 +00:00
parent a4c2cbd49a
commit b91935040a
2 changed files with 12 additions and 3 deletions

View File

@ -1,4 +1,4 @@
.TH fltk-config 1 "Fast Light Tool Kit" "8 August 2005"
.TH fltk-config 1 "Fast Light Tool Kit" "24 September 2006"
.SH NAME
fltk-config \- script to get information about the installed version of fltk.
.sp
@ -10,7 +10,7 @@ fltk-config [ --prefix
] [ --version ] [ --api-version ] [ --use-gl ] [ --use-images ] [ --use-glut ]
[ --cc ] [ --cxx ]
[ --cflags ] [ --cxxflags ] [ --ldflags ] [ --ldstaticflags ] [ --libs ]
[ -g ] [ --compile
[ -D\fIname[=value]\fR ] [ -g ] [ --compile
.I program.cxx
] [ --post
.I program

View File

@ -149,7 +149,16 @@ int Fl_Choice::handle(int e) {
case FL_PUSH:
if (Fl::visible_focus()) Fl::focus(this);
J1:
v = menu()->pulldown(x(), y(), w(), h(), mvalue(), this);
if (Fl::scheme()) {
v = menu()->pulldown(x(), y(), w(), h(), mvalue(), this);
} else {
// In order to preserve the old look-n-feel of "white" menus,
// temporarily override the color() of this widget...
Fl_Color c = color();
color(FL_BACKGROUND2_COLOR);
v = menu()->pulldown(x(), y(), w(), h(), mvalue(), this);
color(c);
}
if (!v || v->submenu()) return 1;
if (v != mvalue()) redraw();
picked(v);