summaryrefslogtreecommitdiff
path: root/FL/Fl_Tree_Item.H
diff options
context:
space:
mode:
authorGreg Ercolano <erco@seriss.com>2014-01-16 00:58:58 +0000
committerGreg Ercolano <erco@seriss.com>2014-01-16 00:58:58 +0000
commitb849a1d2d9c5eb76bccebe4f48716db15933e135 (patch)
treed8841161b42c03810b570d197abebbab9c56fa6f /FL/Fl_Tree_Item.H
parent9c6eb8be290cf9a95f987be96677cdb45be27fd8 (diff)
ABI fixes.
These are problems "ABI Compliance Checker" found with the recent Fl_Tree mods. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10062 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Tree_Item.H')
-rw-r--r--FL/Fl_Tree_Item.H10
1 files changed, 7 insertions, 3 deletions
diff --git a/FL/Fl_Tree_Item.H b/FL/Fl_Tree_Item.H
index b51d90907..8493b7e44 100644
--- a/FL/Fl_Tree_Item.H
+++ b/FL/Fl_Tree_Item.H
@@ -103,7 +103,6 @@ protected:
void draw_vertical_connector(int x, int y1, int y2, const Fl_Tree_Prefs &prefs);
void draw_horizontal_connector(int x1, int x2, int y, const Fl_Tree_Prefs &prefs);
void recalc_tree();
- const Fl_Tree_Item* find_clicked_(const Fl_Tree_Prefs &prefs, int yonly=0) const; // internal
public:
Fl_Tree_Item(const Fl_Tree_Prefs &prefs); // CTOR -- backwards compatible
#if FLTK_ABI_VERSION >= 10303
@@ -377,8 +376,13 @@ public:
//////////////////
// Events
//////////////////
- const Fl_Tree_Item *find_clicked(const Fl_Tree_Prefs &prefs, int yonly=0) const;
- Fl_Tree_Item *find_clicked(const Fl_Tree_Prefs &prefs, int yonly=0);
+#if FLTK_ABI_VERSION >= 10303
+ const Fl_Tree_Item* find_clicked(const Fl_Tree_Prefs &prefs, int yonly=0) const;
+ Fl_Tree_Item* find_clicked(const Fl_Tree_Prefs &prefs, int yonly=0);
+#else
+ const Fl_Tree_Item* find_clicked(const Fl_Tree_Prefs &prefs) const;
+ Fl_Tree_Item* find_clicked(const Fl_Tree_Prefs &prefs);
+#endif
int event_on_collapse_icon(const Fl_Tree_Prefs &prefs) const;
int event_on_label(const Fl_Tree_Prefs &prefs) const;
/// Is this item the root of the tree?