From 165cd2b63b924e82fc4801a0041be335c8e5a5c6 Mon Sep 17 00:00:00 2001 From: Greg Ercolano Date: Mon, 30 Apr 2012 17:14:15 +0000 Subject: Fixes STR#2832; support labels on tree child widget()s. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9411 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Tree.H | 1 + src/Fl_Tree_Item.cxx | 2 ++ 2 files changed, 3 insertions(+) diff --git a/FL/Fl_Tree.H b/FL/Fl_Tree.H index a53560f8b..2a4b8cfa3 100644 --- a/FL/Fl_Tree.H +++ b/FL/Fl_Tree.H @@ -277,6 +277,7 @@ enum Fl_Tree_Reason { }; 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) diff --git a/src/Fl_Tree_Item.cxx b/src/Fl_Tree_Item.cxx index 79ab11ad4..5b8d8c471 100644 --- a/src/Fl_Tree_Item.cxx +++ b/src/Fl_Tree_Item.cxx @@ -8,6 +8,7 @@ #include #include #include +#include ////////////////////// // Fl_Tree_Item.cxx @@ -741,6 +742,7 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree, // 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 && -- cgit v1.2.3