diff options
| author | Greg Ercolano <erco@seriss.com> | 2014-12-19 03:41:45 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2014-12-19 03:41:45 +0000 |
| commit | cdee5e204faaefd92eab79a8738da5982c990e6c (patch) | |
| tree | 9fa87d91755d611fdb1108f956d841c89dcab4d8 | |
| parent | 2ca381c281503c221b022d63f2cd1aa2e366fd52 (diff) | |
Fixes STR #3169, comment #3.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10492 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Enumerations.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Tabs.H | 7 | ||||
| -rw-r--r-- | src/Fl_Tabs.cxx | 6 |
3 files changed, 13 insertions, 2 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 3a793c3c9..ec2619ca5 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -27,7 +27,7 @@ * in the current patch release of FLTK. ** Use for static builds only! ** * For more info on this macro, see: http://fltk.org/cmp.php#FLTK_ABI_VERSION */ -//#define FLTK_ABI_VERSION 10303 +//#define FLTK_ABI_VERSION 10304 # include "Fl_Export.H" # include "fl_types.h" diff --git a/FL/Fl_Tabs.H b/FL/Fl_Tabs.H index b6693210d..756b550cf 100644 --- a/FL/Fl_Tabs.H +++ b/FL/Fl_Tabs.H @@ -199,7 +199,12 @@ such as using the arrow keys while at the left or right end of the tabs. */ class FL_EXPORT Fl_Tabs : public Fl_Group { - Fl_Widget *value_; +#if FLTK_ABI_VERSION >= 10304 + // NEW (nothing) +#else + // OLD (maintained for ABI compat) + Fl_Widget *value_; // NOTE: this member no longer used -- STR #3169 +#endif Fl_Widget *push_; int *tab_pos; // array of x-offsets of tabs per child + 1 int *tab_width; // array of widths of tabs per child + 1 diff --git a/src/Fl_Tabs.cxx b/src/Fl_Tabs.cxx index cd2240652..bbc662a7b 100644 --- a/src/Fl_Tabs.cxx +++ b/src/Fl_Tabs.cxx @@ -461,6 +461,12 @@ Fl_Tabs::Fl_Tabs(int X,int Y,int W, int H, const char *l) : Fl_Group(X,Y,W,H,l) { box(FL_THIN_UP_BOX); +#if FLTK_ABI_VERSION >= 10304 + // NEW (nothing) +#else + // OLD (init to prevent 'unused' warnings) -- STR #3169 + value_ = 0; // NOTE: this member unused -- STR #3169 +#endif push_ = 0; tab_pos = 0; tab_width = 0; |