diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-09-24 13:35:23 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2006-09-24 13:35:23 +0000 |
| commit | b91935040a449a4a378d21907855479751a136cd (patch) | |
| tree | 0a250f46587a1dc50cab5c5c58cec8ef80b5ee8a | |
| parent | a4c2cbd49a5cbba195cd66f4dffd4b621c6b4016 (diff) | |
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
| -rw-r--r-- | documentation/fltk-config.man | 4 | ||||
| -rw-r--r-- | src/Fl_Choice.cxx | 11 |
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); |