Author: greg.ercolano
Date: 2012-04-30 10:14:15 -0700 (Mon, 30 Apr 2012)
New Revision: 9411
Log:
Fixes STR#2832; support labels on tree child widget()s.
Modified:
branches/branch-1.3/FL/Fl_Tree.H
branches/branch-1.3/src/Fl_Tree_Item.cxx
Modified: branches/branch-1.3/FL/Fl_Tree.H
===================================================================
--- branches/branch-1.3/FL/Fl_Tree.H 2012-04-30 00:27:48 UTC (rev 9410)
+++ branches/branch-1.3/FL/Fl_Tree.H 2012-04-30 17:14:15 UTC (rev 9411)
@@ -277,6 +277,7 @@
};
class FL_EXPORT Fl_Tree : public Fl_Group {
+ friend class Fl_Tree_Item;
Fl_Tree_Item *_root; // can be null!
Fl_Tree_Item *_item_focus; // item that has focus box
Fl_Tree_Item *_callback_item; // item invoked during callback
(can be NULL)
Modified: branches/branch-1.3/src/Fl_Tree_Item.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Tree_Item.cxx 2012-04-30 00:27:48 UTC (rev
9410)
+++ branches/branch-1.3/src/Fl_Tree_Item.cxx 2012-04-30 17:14:15 UTC (rev
9411)
@@ -8,6 +8,7 @@
#include <FL/Fl_Widget.H>
#include <FL/Fl_Tree_Item.H>
#include <FL/Fl_Tree_Prefs.H>
+#include <FL/Fl_Tree.H>
//////////////////////
// Fl_Tree_Item.cxx
@@ -741,6 +742,7 @@
// Draw child FLTK widget?
if ( widget() && widget()->damage() ) {
widget()->draw();
+ ((Fl_Tree*)tree)->draw_outside_label(*widget());
}
// Draw focus box around item's bg last
if ( this == itemfocus &&
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
