diff options
| -rw-r--r-- | documentation/src/migration_1_5.dox | 6 | ||||
| -rw-r--r-- | src/fl_boxtype.cxx | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/documentation/src/migration_1_5.dox b/documentation/src/migration_1_5.dox index 107bfe061..9282a1293 100644 --- a/documentation/src/migration_1_5.dox +++ b/documentation/src/migration_1_5.dox @@ -97,13 +97,13 @@ removed in the next minor FLTK version, presumably 1.6.0. Please update your code! -The following list is currently incomplete and will be extended later. - +\todo This table of deprecated functions since FLTK 1.5 may be incomplete and + should be completed before the release of FLTK 1.5.0. Symbol To Be Removed In The Next Minor Release | Please Replace With ... -------------------------------------------------------|------------------------- void Fl_Window::icon(const void *ic) | void Fl_Window::icon(const Fl_RGB_Image *icon) -const void *Fl_Window::icon() const | no replacement (was platform specific) +const void * Fl_Window::icon() const | no replacement (Windows platform specific) | Fl_Tree::first_visible() | in 1.3.3 ABI Fl_Tree::first_visible_item() | ? diff --git a/src/fl_boxtype.cxx b/src/fl_boxtype.cxx index 5d81fae10..8c6998344 100644 --- a/src/fl_boxtype.cxx +++ b/src/fl_boxtype.cxx @@ -396,14 +396,17 @@ void fl_oxy_round_down_box(int x, int y, int w, int h, Fl_Color col); // See also Fl::box_bg() which returns true if bit 1 == zero. // ///////////////////////////////////////////////////////////////////// -static struct { +typedef struct { Fl_Box_Draw_F *f; uchar dx, dy, dw, dh; int flags; Fl_Box_Draw_Focus_F *ff; bool set() { return flags & 1; } bool bg() { return !(flags & 2); } -} fl_box_table[FL_MAX_BOXTYPE+1] = { +} boxtable_t; + +static boxtable_t fl_box_table[FL_MAX_BOXTYPE+1] = { + // must match list in Enumerations.H !!! { fl_no_box, 0, 0, 0, 0, 3 }, // FL_NO_BOX { fl_flat_box, 0, 0, 0, 0, 1 }, // FL_FLAT_BOX |