mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fl_Tree failed to compile if built with no ABI guard set (or the default 1.3.0 set).

Browse Source 
The variable "_lastselect" had been added to the methods Fl_Tree::remove() and Fl_Tree::clear() without any ABI guards, but "_lastselect" was added to the class ABI at 10301 (so far as I can tell).

Builds now with my patch: not sure it is correct, but... Will commit anyway since it allows the lib to build, but please feel free to fix it better!




git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@11314 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Ian MacArthur 2016-03-08 09:56:46 +00:00
parent d01ff3864f
commit 337e115c54
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Fl_Tree.cxx
View File

@ -1118,7 +1118,9 @@ Fl_Tree_Item* Fl_Tree::insert(Fl_Tree_Item *item, const char *name, int pos) {
int Fl_Tree::remove(Fl_Tree_Item *item) {
// Item being removed is focus item? zero focus
if ( item == _item_focus ) _item_focus = 0;
#if FLTK_ABI_VERSION >= 10301
if ( item == _lastselect ) _lastselect = 0;
#endif /*FLTK_ABI_VERSION*/
if ( item == _root ) {
clear();
} else {
@ -1137,7 +1139,9 @@ void Fl_Tree::clear() {
_root->clear_children();
delete _root; _root = 0;
_item_focus = 0;
#if FLTK_ABI_VERSION >= 10301
_lastselect = 0;
#endif /*FLTK_ABI_VERSION*/
}
/// Clear all the children for \p 'item'.