mirror of https://github.com/fltk/fltk
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
This commit is contained in:
parent
0f493a9739
commit
1d3f79bc23
20
FL/Fl_Tree.H
20
FL/Fl_Tree.H
|
@ -193,6 +193,17 @@ enum Fl_Tree_Reason {
|
||||||
FL_TREE_REASON_CLOSED ///< an item was closed
|
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 {
|
class FL_EXPORT Fl_Tree : public Fl_Group {
|
||||||
Fl_Tree_Item *_root; // can be null!
|
Fl_Tree_Item *_root; // can be null!
|
||||||
Fl_Tree_Item *_item_focus; // item that has focus box
|
Fl_Tree_Item *_item_focus; // item that has focus box
|
||||||
|
@ -207,15 +218,6 @@ class FL_EXPORT Fl_Tree : public Fl_Group {
|
||||||
|
|
||||||
// NEW:
|
// NEW:
|
||||||
public:
|
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
|
//! Returns the current item re/selection mode
|
||||||
Fl_Tree_Item_Reselect_Mode item_reselect_mode() const {
|
Fl_Tree_Item_Reselect_Mode item_reselect_mode() const {
|
||||||
return _itemReselectMode;
|
return _itemReselectMode;
|
||||||
|
|
|
@ -225,7 +225,7 @@ Function {} {open
|
||||||
user_data 1234
|
user_data 1234
|
||||||
callback {G_cb_counter++; // Increment callback counter whenever tree callback is invoked
|
callback {G_cb_counter++; // Increment callback counter whenever tree callback is invoked
|
||||||
\#if FLTK_ABI_VERSION >= 10302
|
\#if FLTK_ABI_VERSION >= 10302
|
||||||
tree->item_reselect_mode(Fl_Tree::FL_TREE_SELECTABLE_ALWAYS);
|
tree->item_reselect_mode(FL_TREE_SELECTABLE_ALWAYS);
|
||||||
\#endif
|
\#endif
|
||||||
Fl_Tree_Item *item = tree->callback_item();
|
Fl_Tree_Item *item = tree->callback_item();
|
||||||
if ( item ) {
|
if ( item ) {
|
||||||
|
|
Loading…
Reference in New Issue