summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2016-03-26 02:55:14 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2016-03-26 02:55:14 +0000
commit29a9e89b39c2fdc1f9498717f5ae53798528ffb1 (patch)
treedcdc51d1f4c12ae67665a5d4d353e9c731f46eb3 /FL
parentde9dc764f1a34a3032d560839687b551865c532f (diff)
Remove FLTK_ABI_VERSION from all but *tree*.* and documentation.
Everything related to Fl_Tree and its test and demo programs has been cleaned. Documentation needs updates. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11428 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl_Spinner.H5
-rw-r--r--FL/Fl_Table.H13
-rw-r--r--FL/Fl_Tabs.H6
-rw-r--r--FL/Fl_Text_Display.H8
-rw-r--r--FL/porting.H12
5 files changed, 5 insertions, 39 deletions
diff --git a/FL/Fl_Spinner.H b/FL/Fl_Spinner.H
index 22da7886f..10df08613 100644
--- a/FL/Fl_Spinner.H
+++ b/FL/Fl_Spinner.H
@@ -3,7 +3,7 @@
//
// Spinner widget for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2016 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@@ -50,10 +50,7 @@ class FL_EXPORT Fl_Spinner : public Fl_Group {
double step_; // Amount to add/subtract for up/down
const char *format_; // Format string
-#if FLTK_ABI_VERSION >= 10301
-// NEW
protected:
-#endif
Fl_Input input_; // Input field for the value
Fl_Repeat_Button
up_button_, // Up button
diff --git a/FL/Fl_Table.H b/FL/Fl_Table.H
index 341f878b8..bce52bb3e 100644
--- a/FL/Fl_Table.H
+++ b/FL/Fl_Table.H
@@ -209,15 +209,11 @@ private:
int _auto_drag;
int _selecting;
-#if FLTK_ABI_VERSION >= 10301
int _scrollbar_size;
-#endif
-#if FLTK_ABI_VERSION >= 10303
enum {
TABCELLNAV = 1<<0, ///> tab cell navigation flag
};
unsigned int flags_;
-#endif
// An STL-ish vector without templates
class FL_EXPORT IntVector {
@@ -1079,8 +1075,6 @@ public:
void callback(Fl_Widget*, void*);
#endif
-#if FLTK_ABI_VERSION >= 10301
- // NEW
/**
Gets the current size of the scrollbars' troughs, in pixels.
@@ -1093,6 +1087,7 @@ public:
int scrollbar_size() const {
return(_scrollbar_size);
}
+
/**
Sets the pixel size of the scrollbars' troughs to \p newSize, in pixels.
@@ -1114,9 +1109,8 @@ public:
void scrollbar_size(int newSize) {
if ( newSize != _scrollbar_size ) redraw();
_scrollbar_size = newSize;
- }
-#endif
-#if FLTK_ABI_VERSION >= 10303
+ }
+
/**
Flag to control if Tab navigates table cells or not.
@@ -1145,7 +1139,6 @@ public:
int tab_cell_nav() const {
return(flags_ & TABCELLNAV ? 1 : 0);
}
-#endif
};
#endif /*_FL_TABLE_H*/
diff --git a/FL/Fl_Tabs.H b/FL/Fl_Tabs.H
index 756b550cf..3d75db81d 100644
--- a/FL/Fl_Tabs.H
+++ b/FL/Fl_Tabs.H
@@ -199,12 +199,6 @@
such as using the arrow keys while at the left or right end of the tabs.
*/
class FL_EXPORT Fl_Tabs : public Fl_Group {
-#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/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H
index 7237bc86f..1f0615d0e 100644
--- a/FL/Fl_Text_Display.H
+++ b/FL/Fl_Text_Display.H
@@ -73,11 +73,7 @@
Note that other features may be available via Fl_Text_Editor
and Fl_Text_Buffer classes.
- \note Line numbers were added in 1.3.3. To avoid breaking ABI,
- many of its options are read only. To adjust these features
- in 1.3.x, you must build FLTK with FLTK_ABI_VERSION set to 10303
- or higher.
-
+ \note Line numbers were added in FLTK 1.3.3.
*/
class FL_EXPORT Fl_Text_Display: public Fl_Group {
@@ -526,14 +522,12 @@ protected:
int mLineNumLeft, mLineNumWidth;
// Line number font/colors
-#if FLTK_ABI_VERSION >= 10303
Fl_Font linenumber_font_;
Fl_Fontsize linenumber_size_;
Fl_Color linenumber_fgcolor_;
Fl_Color linenumber_bgcolor_;
Fl_Align linenumber_align_;
const char* linenumber_format_;
-#endif
};
#endif
diff --git a/FL/porting.H b/FL/porting.H
index 744e34486..c9c68b2e7 100644
--- a/FL/porting.H
+++ b/FL/porting.H
@@ -67,14 +67,7 @@ public:
Fl_Offscreen other_xid; // pointer for offscreen bitmaps (overlay window)
Fl_Window *w; // FLTK window for
Fl_Region region;
-//#if FLTK_ABI_VERSION < 10304
-// Fl_Region subRegion; // for ABI compatibility, recycled to replace subRect_
-//#endif
Fl_X *next; // chain of mapped windows
-//#if FLTK_ABI_VERSION < 10304
-// Fl_X *xidChildren; // useless with true subwindows, recycled to replace mapped_to_retina_
-// Fl_X *xidNext; // useless with true subwindows
-//#endif
int wait_for_expose;
// NSCursor *cursor;
static Fl_X* first;
@@ -82,13 +75,8 @@ public:
static int fake_X_wm(const Fl_Window*,int&,int&,int&,int&,int&);
static Fl_X* make(Fl_Window*);
void flush();
-//#if FLTK_ABI_VERSION >= 10304
// CGRect* subRect() { return subRect_; } // getter
// void subRect(CGRect *r) { subRect_ = r; } // setter
-//#else
-// CGRect* subRect() { return (CGRect*)subRegion; } // getter
-// void subRect(CGRect *r) { subRegion = (Fl_Region)r; } // setter
-//#endif
// bool mapped_to_retina(); // is window mapped to retina display?
// void mapped_to_retina(bool); // sets whether window is mapped to retina display
// bool changed_resolution(); // did window just moved to display with another resolution?