Fixes STR #3169, comment #3.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10492 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Greg Ercolano
2014-12-19 03:41:45 +00:00
parent 2ca381c281
commit cdee5e204f
3 changed files with 13 additions and 2 deletions
+1 -1
View File
@@ -27,7 +27,7 @@
* in the current patch release of FLTK. ** Use for static builds only! ** * 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 * 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_Export.H"
# include "fl_types.h" # include "fl_types.h"
+6 -1
View File
@@ -199,7 +199,12 @@
such as using the arrow keys while at the left or right end of the tabs. such as using the arrow keys while at the left or right end of the tabs.
*/ */
class FL_EXPORT Fl_Tabs : public Fl_Group { 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_; Fl_Widget *push_;
int *tab_pos; // array of x-offsets of tabs per child + 1 int *tab_pos; // array of x-offsets of tabs per child + 1
int *tab_width; // array of widths of tabs per child + 1 int *tab_width; // array of widths of tabs per child + 1
+6
View File
@@ -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) Fl_Group(X,Y,W,H,l)
{ {
box(FL_THIN_UP_BOX); 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; push_ = 0;
tab_pos = 0; tab_pos = 0;
tab_width = 0; tab_width = 0;