diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2007-05-16 08:30:48 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2007-05-16 08:30:48 +0000 |
| commit | 2c7bea98fe956a88fbe34d14d4f289d3fc866c26 (patch) | |
| tree | 5cf2d1fe997f3d8d9ec8fa65c92cfda1a688acf9 /FL | |
| parent | 1feb3ed69ccc5466bfcecf34f585d36465cbed68 (diff) | |
STR #1678: improved fl_down, fl_frame, added fl_box, updated documentation. Fixed indent in Fl_Input_Choice.H
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5834 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Enumerations.H | 11 | ||||
| -rw-r--r-- | FL/Fl_Input_Choice.H | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index aabf1baf8..c86c42166 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -229,8 +229,15 @@ extern FL_EXPORT Fl_Boxtype fl_define_FL_GTK_UP_BOX(); #define FL_GTK_ROUND_DOWN_BOX (Fl_Boxtype)(fl_define_FL_GTK_UP_BOX()+9) // conversions of box types to other boxtypes: -inline Fl_Boxtype fl_down(Fl_Boxtype b) {return (Fl_Boxtype)(b|1);} -inline Fl_Boxtype fl_frame(Fl_Boxtype b) {return (Fl_Boxtype)(b|2);} +inline Fl_Boxtype fl_box(Fl_Boxtype b) { + return (Fl_Boxtype)((b<FL_UP_BOX||b%4>1)?b:(b-2)); +} +inline Fl_Boxtype fl_down(Fl_Boxtype b) { + return (Fl_Boxtype)((b<FL_UP_BOX)?b:(b|1)); +} +inline Fl_Boxtype fl_frame(Fl_Boxtype b) { + return (Fl_Boxtype)((b%4<2)?b:(b+2)); +} // back-compatability box types: #define FL_FRAME FL_ENGRAVED_FRAME diff --git a/FL/Fl_Input_Choice.H b/FL/Fl_Input_Choice.H index 45fbe70db..45971bc4b 100644 --- a/FL/Fl_Input_Choice.H +++ b/FL/Fl_Input_Choice.H @@ -98,9 +98,9 @@ public: void add(const char *s) { menu_->add(s); } - int changed() const { - return inp_->changed(); - } + int changed() const { + return inp_->changed(); + } void clear() { menu_->clear(); } |