From 1d3f79bc23a892fcc964bc53d499bd94e175989e Mon Sep 17 00:00:00 2001 From: Fabien Costantini Date: Mon, 16 Apr 2012 03:29:56 +0000 Subject: Made homogen the scope of the new fl_tree enum with previous Fl_Tree_Reason enum. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9350 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Tree.H | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'FL/Fl_Tree.H') diff --git a/FL/Fl_Tree.H b/FL/Fl_Tree.H index e46f28e16..b0b5793aa 100644 --- a/FL/Fl_Tree.H +++ b/FL/Fl_Tree.H @@ -193,6 +193,17 @@ enum Fl_Tree_Reason { FL_TREE_REASON_CLOSED ///< an item was closed }; +#if FLTK_ABI_VERSION >= 10302 +/// \enum Fl_Tree_Item_Select_Mode +/// Defines the ways an item can be (re) selected. +/// +enum Fl_Tree_Item_Reselect_Mode +{ + FL_TREE_SELECTABLE_ONCE=0, /// backward compatible default: an item can only be selected once + FL_TREE_SELECTABLE_ALWAYS, /// needed for new RESELECT feature +}; +#endif + class FL_EXPORT Fl_Tree : public Fl_Group { Fl_Tree_Item *_root; // can be null! Fl_Tree_Item *_item_focus; // item that has focus box @@ -207,15 +218,6 @@ class FL_EXPORT Fl_Tree : public Fl_Group { // NEW: public: - /// \enum Fl_Tree_Item_Select_Mode - /// Defines the ways an item can be (re) selected. - /// - enum Fl_Tree_Item_Reselect_Mode - { - FL_TREE_SELECTABLE_ONCE=0, /// backward compatible default: an item can only be selected once - FL_TREE_SELECTABLE_ALWAYS, /// needed for new RESELECT feature - }; - //! Returns the current item re/selection mode Fl_Tree_Item_Reselect_Mode item_reselect_mode() const { return _itemReselectMode; -- cgit v1.2.3