diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-10-29 03:44:33 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-10-29 03:44:33 +0000 |
| commit | 079082ef7c67377f8e24fcec6cadaa4c49e3af2b (patch) | |
| tree | 6967ed6788ff20429fd5fd9c132517c676cb942f /FL/Fl_Menu_.H | |
| parent | a00b52a6760c83414a518a69d91761389d9db322 (diff) | |
32-bit color (RGB0 or 000I), a la FLTK 2.0, including fl_rgb_color()
function to generate an RGB Fl_Color value.
Sort button names in FLUID.
Fix focus and scroll problems in Fl_Text_Display/Editor.
Fix radio/button demo.
Removed D2 menubar.H header...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1663 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Menu_.H')
| -rw-r--r-- | FL/Fl_Menu_.H | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/FL/Fl_Menu_.H b/FL/Fl_Menu_.H index 5850e9421..37bd88f9c 100644 --- a/FL/Fl_Menu_.H +++ b/FL/Fl_Menu_.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_.H,v 1.7.2.4 2001/01/22 15:13:37 easysw Exp $" +// "$Id: Fl_Menu_.H,v 1.7.2.4.2.1 2001/10/29 03:44:31 easysw Exp $" // // Menu base class header file for the Fast Light Tool Kit (FLTK). // @@ -38,11 +38,11 @@ class Fl_Menu_ : public Fl_Widget { protected: + uchar alloc; uchar down_box_; uchar textfont_; uchar textsize_; - uchar textcolor_; - uchar alloc; + unsigned textcolor_; public: FL_EXPORT const Fl_Menu_Item* picked(const Fl_Menu_Item*); @@ -80,18 +80,18 @@ public: uchar textsize() const {return textsize_;} void textsize(uchar c) {textsize_=c;} Fl_Color textcolor() const {return (Fl_Color)textcolor_;} - void textcolor(uchar c) {textcolor_=c;} + void textcolor(unsigned c) {textcolor_=c;} Fl_Boxtype down_box() const {return (Fl_Boxtype)down_box_;} void down_box(Fl_Boxtype b) {down_box_ = b;} // back compatability: Fl_Color down_color() const {return selection_color();} - void down_color(uchar c) {selection_color(c);} + void down_color(unsigned c) {selection_color(c);} }; #endif // -// End of "$Id: Fl_Menu_.H,v 1.7.2.4 2001/01/22 15:13:37 easysw Exp $". +// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.1 2001/10/29 03:44:31 easysw Exp $". // |