summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--documentation/fltk-config.man4
-rw-r--r--src/Fl_Choice.cxx11
2 files changed, 12 insertions, 3 deletions
diff --git a/documentation/fltk-config.man b/documentation/fltk-config.man
index 423e7538a..dbe6d4bd2 100644
--- a/documentation/fltk-config.man
+++ b/documentation/fltk-config.man
@@ -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
diff --git a/src/Fl_Choice.cxx b/src/Fl_Choice.cxx
index e44fd624e..f9eabde20 100644
--- a/src/Fl_Choice.cxx
+++ b/src/Fl_Choice.cxx
@@ -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);