Author: fabien
Date: 2012-04-15 20:29:56 -0700 (Sun, 15 Apr 2012)
New Revision: 9350
Log:
Made homogen the scope of the new fl_tree enum with previous Fl_Tree_Reason
enum.
Modified:
branches/branch-1.3/FL/Fl_Tree.H
branches/branch-1.3/test/tree.fl
Modified: branches/branch-1.3/FL/Fl_Tree.H
===================================================================
--- branches/branch-1.3/FL/Fl_Tree.H 2012-04-15 21:16:48 UTC (rev 9349)
+++ branches/branch-1.3/FL/Fl_Tree.H 2012-04-16 03:29:56 UTC (rev 9350)
@@ -193,6 +193,17 @@
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 @@
// 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;
Modified: branches/branch-1.3/test/tree.fl
===================================================================
--- branches/branch-1.3/test/tree.fl 2012-04-15 21:16:48 UTC (rev 9349)
+++ branches/branch-1.3/test/tree.fl 2012-04-16 03:29:56 UTC (rev 9350)
@@ -225,7 +225,7 @@
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 ) {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
