diff options
| author | Fabien Costantini <fabien@onepost.net> | 2012-04-16 03:29:56 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2012-04-16 03:29:56 +0000 |
| commit | 1d3f79bc23a892fcc964bc53d499bd94e175989e (patch) | |
| tree | b703c6951d5b6d95c7b2cb60abee765584a86e08 | |
| parent | 0f493a973902050bdac286e52d62f686b7363a64 (diff) | |
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
| -rw-r--r-- | FL/Fl_Tree.H | 20 | ||||
| -rw-r--r-- | test/tree.fl | 2 |
2 files changed, 12 insertions, 10 deletions
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; diff --git a/test/tree.fl b/test/tree.fl index 8e6d90d34..13269b576 100644 --- a/test/tree.fl +++ b/test/tree.fl @@ -225,7 +225,7 @@ Function {} {open user_data 1234 callback {G_cb_counter++; // Increment callback counter whenever tree callback is invoked \#if FLTK_ABI_VERSION >= 10302 - tree->item_reselect_mode(Fl_Tree::FL_TREE_SELECTABLE_ALWAYS); + tree->item_reselect_mode(FL_TREE_SELECTABLE_ALWAYS); \#endif Fl_Tree_Item *item = tree->callback_item(); if ( item ) { |