From 2c5006563f893723f0f224d7b3115e5fd03272ca Mon Sep 17 00:00:00 2001 From: Greg Ercolano Date: Sun, 30 Jan 2011 20:22:06 +0000 Subject: Fl_Tree API breaking changes (we haven't released 1.3.0 yet..): Fl_Tree::labelsize() -> item_labelsize() -- TO AVOID COLLISION WITH Fl_Widget::labelsize()! Fl_Tree::labelfont() -> item_labelfont() -- TO AVOID COLLISION WITH Fl_Widget::labelfont()! Fl_Tree_Prefs (internal) changes: Fl_Tree_Prefs::fgcolor() -> labelfgcolor() -- for consistency with above Fl_Tree_Prefs::bgcolor() -> labelbgcolor() -- for consistency with above Fl_Tree_Prefs::selectcolor() removed -- uses Fl_Widget::selection_color() instead Fl_Tree_Prefs::inactivecolor() removed -- was unused; inactive color procedurally calculated Other Fl_Tree mods: o Fixed bug with select_all(item) and deselect_all(item) (they were not limiting themselves to children of specified item) o Fixed bug with item not drawing in its /own/ bgcolor when item selected o Fl_Tree uses the Fl_Widget::selection_color() o All methods that deal with 'font types' changed int -> Fl_Font o All methods that deal with 'font sizes' changed int -> Fl_Fontsize o Added needed methods to Fl_Tree for accessing colors: item_labelfgcolor() -- access default fg color used for new items item_labelbgcolor() -- access default bg color used for new items tree_connectorcolor() -- access the connector line color o Small doxygen comment adjustments and general clarifications o test/tree demo modified to include testing of new label color methods, cleanup git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8340 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Tree_Item.H | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'FL/Fl_Tree_Item.H') diff --git a/FL/Fl_Tree_Item.H b/FL/Fl_Tree_Item.H index 3163668ed..c5a742ad9 100644 --- a/FL/Fl_Tree_Item.H +++ b/FL/Fl_Tree_Item.H @@ -58,8 +58,8 @@ /// class FL_EXPORT Fl_Tree_Item { const char *_label; // label (memory managed) - int _labelfont; // label's font face - int _labelsize; // label's font size + Fl_Font _labelfont; // label's font face + Fl_Fontsize _labelsize; // label's font size Fl_Color _labelfgcolor; // label's fg color Fl_Color _labelbgcolor; // label's bg color char _open; // item is open? @@ -99,19 +99,19 @@ public: inline void* user_data() const { return _userdata; } /// Set item's label font face. - void labelfont(int val) { + void labelfont(Fl_Font val) { _labelfont = val; } /// Get item's label font face. - int labelfont() const { + Fl_Font labelfont() const { return(_labelfont); } /// Set item's label font size. - void labelsize(int val) { + void labelsize(Fl_Fontsize val) { _labelsize = val; } /// Get item's label font size. - int labelsize() const { + Fl_Fontsize labelsize() const { return(_labelsize); } /// Set item's label foreground text color. -- cgit v1.2.3