diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-02-20 13:02:27 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-02-20 13:02:27 +0000 |
| commit | 50274f8d85151d82b8f7945d9de044fe5e74bd52 (patch) | |
| tree | f3cf28443f8b9f0daea2d052892999d31a432325 /src/Fl_Menu.cxx | |
| parent | be3181a39a1ba2030be9df0ece67cdadda0b435f (diff) | |
Update copyright in FLUID "about" window.
Update fltk-config to support all C++ file extensions.
Make background of FLTK logo transparent.
Disable overlays if the scheme is set.
Fix table cell formatting in Fl_Help_View. Still need to resolve an
issue with column widths vs. table widths.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1965 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Menu.cxx')
| -rw-r--r-- | src/Fl_Menu.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 2e16434f1..04989f8f4 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.6 2002/01/01 15:11:30 easysw Exp $" +// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.7 2002/02/20 13:02:27 easysw Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -202,7 +202,7 @@ menutitle::menutitle(int X, int Y, int W, int H, const Fl_Menu_Item* L) : set_modal(); clear_border(); menu = L; - if (L->labelcolor_) clear_overlay(); + if (L->labelcolor_ || Fl::scheme()) clear_overlay(); } menuwindow::menuwindow(const Fl_Menu_Item* m, int X, int Y, int Wp, int Hp, @@ -255,7 +255,7 @@ menuwindow::menuwindow(const Fl_Menu_Item* m, int X, int Y, int Wp, int Hp, w1 = int(fl_width(fl_shortcut_label(m->shortcut_))) + 8; if (w1 > hotKeysw) hotKeysw = w1; } - if (m->labelcolor_) clear_overlay(); + if (m->labelcolor_ || Fl::scheme()) clear_overlay(); } if (selected >= 0 && !Wp) X -= W/2; int BW = Fl::box_dx(box()); @@ -756,5 +756,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.6 2002/01/01 15:11:30 easysw Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.7 2002/02/20 13:02:27 easysw Exp $". // |