diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Enumerations.H | 3 | ||||
| -rw-r--r-- | FL/Fl.H | 7 | ||||
| -rw-r--r-- | FL/fl_draw.H | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 6da998576..3d5bc7f89 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -694,7 +694,8 @@ enum Fl_Boxtype { // boxtypes (if you change these you must also change fl_boxty _FL_OXY_ROUND_DOWN_BOX, ///< oxy version of FL_ROUND_DOWN_BOX, use FL_OXY_ROUND_DOWN_BOX _FL_OXY_BUTTON_UP_BOX, ///< FL_OXY_BUTTON_UP_BOX (new boxtype ?), use FL_OXY_BUTTON_UP_BOX _FL_OXY_BUTTON_DOWN_BOX, ///< FL_OXY_BUTTON_DOWN_BOX (new boxtype ?), use FL_OXY_BUTTON_DOWN_BOX - FL_FREE_BOXTYPE ///< the first free box type for creation of new box types + FL_FREE_BOXTYPE, ///< the first free box type for creation of new box types + FL_MAX_BOXTYPE = 255 ///< highest legal index for a box type }; #ifndef FL_DOXYGEN @@ -88,6 +88,9 @@ typedef void (Fl_Label_Measure_F)(const Fl_Label *label, int &width, int &height /** Signature of some box drawing functions passed as parameters */ typedef void (Fl_Box_Draw_F)(int x, int y, int w, int h, Fl_Color color); +/** Signature of box focus frame drawing functions */ +typedef void (Fl_Box_Draw_Focus_F)(Fl_Boxtype bt, int x, int y, int w, int h, Fl_Color fg, Fl_Color bg); + /** Signature of timeout callback functions passed as parameters. Please see Fl::add_timeout() for details. */ @@ -1215,7 +1218,9 @@ public: // boxtypes: static Fl_Box_Draw_F *get_boxtype(Fl_Boxtype); - static void set_boxtype(Fl_Boxtype, Fl_Box_Draw_F*,uchar,uchar,uchar,uchar); + static void set_boxtype(Fl_Boxtype, Fl_Box_Draw_F*, + uchar, uchar, uchar, uchar, + Fl_Box_Draw_Focus_F* =NULL); static void set_boxtype(Fl_Boxtype, Fl_Boxtype from); static int box_dx(Fl_Boxtype); static int box_dy(Fl_Boxtype); diff --git a/FL/fl_draw.H b/FL/fl_draw.H index 7cf3f6838..14137c5d7 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -976,6 +976,7 @@ FL_EXPORT void fl_draw(const char *str, int x, int y, int w, int h, Fl_Align ali FL_EXPORT void fl_frame(const char *s, int x, int y, int w, int h); FL_EXPORT void fl_frame2(const char *s, int x, int y, int w, int h); FL_EXPORT void fl_draw_box(Fl_Boxtype, int x, int y, int w, int h, Fl_Color); +FL_EXPORT void fl_draw_box_focus(Fl_Boxtype, int x, int y, int w, int h, Fl_Color, Fl_Color); // basic GUI objects (check marks, arrows, more to come ...): |