Author: fabien
Date: 2012-04-15 20:45:03 -0700 (Sun, 15 Apr 2012)
New Revision: 9352
Log:
Made homogen the scope of the new tree enum with previous TreeReason enum.
Modified:
branches/branch-3.0/include/FL/Fl_Tree.H
branches/branch-3.0/include/fltk3/Tree.h
branches/branch-3.0/test/tree.fl
Modified: branches/branch-3.0/include/FL/Fl_Tree.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tree.H 2012-04-16 03:34:10 UTC (rev
9351)
+++ branches/branch-3.0/include/FL/Fl_Tree.H 2012-04-16 03:45:03 UTC (rev
9352)
@@ -41,14 +41,23 @@
//
enum Fl_Tree_Reason {
- FL_TREE_REASON_NONE=0,
- FL_TREE_REASON_SELECTED,
- FL_TREE_REASON_DESELECTED,
- FL_TREE_REASON_RESELECTED,
- FL_TREE_REASON_OPENED,
- FL_TREE_REASON_CLOSED
+ FL_TREE_REASON_NONE=0,
+ FL_TREE_REASON_SELECTED,
+ FL_TREE_REASON_DESELECTED,
+ FL_TREE_REASON_RESELECTED,
+ FL_TREE_REASON_OPENED,
+ FL_TREE_REASON_CLOSED
};
+/// \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, /// by default, items can only be selected once
+ FL_TREE_SELECTABLE_ALWAYS /// needed for new RESELECT feature
+};
+
FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Tree, Tree)
FLTK3_WRAPPER_INTERFACE_WIDGET(Fl_Tree, Tree)
FLTK3_WRAPPER_INTERFACE_END()
@@ -57,27 +66,18 @@
class FL_EXPORT Fl_Tree : public Fl_Group {
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;
+ return _itemReselectMode;
}
//! Sets the item re/selection mode
void item_reselect_mode(Fl_Tree_Item_Reselect_Mode mode) {
- _itemReselectMode = mode;
+ _itemReselectMode = mode;
}
private:
- Fl_Tree_Item_Reselect_Mode _itemReselectMode;
+ Fl_Tree_Item_Reselect_Mode _itemReselectMode;
protected:
Modified: branches/branch-3.0/include/fltk3/Tree.h
===================================================================
--- branches/branch-3.0/include/fltk3/Tree.h 2012-04-16 03:34:10 UTC (rev
9351)
+++ branches/branch-3.0/include/fltk3/Tree.h 2012-04-16 03:45:03 UTC (rev
9352)
@@ -200,6 +200,14 @@
TREE_REASON_CLOSED ///< an item was closed
};
+/// \enum Fl_Tree_Item_Select_Mode
+/// Defines the ways an item can be (re) selected.
+///
+ enum Tree_Item_Reselect_Mode
+ {
+ TREE_SELECTABLE_ONCE=0, /// by default, items can only be selected once
+ TREE_SELECTABLE_ALWAYS /// needed for new RESELECT feature
+ };
class FLTK3_EXPORT Tree : public fltk3::Group {
@@ -211,27 +219,18 @@
int _scrollbar_size; // size of scrollbar trough
public:
- /// \enum Fl_Tree_Item_Select_Mode
- /// Defines the ways an item can be (re) selected.
- ///
- enum Tree_Item_Reselect_Mode
- {
- TREE_SELECTABLE_ONCE=0, /// backward compatible default: an item can
only be selected once
- TREE_SELECTABLE_ALWAYS, /// needed for new RESELECT feature
- };
-
//! Returns the current item re/selection mode
- Tree_Item_Reselect_Mode item_reselect_mode() const {
- return _itemReselectMode;
+ fltk3::Tree_Item_Reselect_Mode item_reselect_mode() const {
+ return _itemReselectMode;
}
//! Sets the item re/selection mode
- void item_reselect_mode(Tree_Item_Reselect_Mode mode) {
- _itemReselectMode = mode;
+ void item_reselect_mode(fltk3::Tree_Item_Reselect_Mode mode) {
+ _itemReselectMode = mode;
}
private:
- Tree_Item_Reselect_Mode _itemReselectMode;
+ fltk3::Tree_Item_Reselect_Mode _itemReselectMode;
protected:
/// Vertical scrollbar
Modified: branches/branch-3.0/test/tree.fl
===================================================================
--- branches/branch-3.0/test/tree.fl 2012-04-16 03:34:10 UTC (rev 9351)
+++ branches/branch-3.0/test/tree.fl 2012-04-16 03:45:03 UTC (rev 9352)
@@ -43,6 +43,7 @@
case fltk3::TREE_REASON_NONE: return("none");
case fltk3::TREE_REASON_SELECTED: return("selected");
case fltk3::TREE_REASON_DESELECTED: return("deselected");
+ case fltk3::TREE_REASON_RESELECTED: return("reselected");
case fltk3::TREE_REASON_OPENED: return("opened");
case fltk3::TREE_REASON_CLOSED: return("closed");
default: return("???");
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
