From 31f320e2c694757e1953e623787df50591108045 Mon Sep 17 00:00:00 2001
From: Greg Ercolano <erco@seriss.com>
Date: Wed, 9 May 2012 21:26:32 +0000
Subject: o Added new 0xffffffff 'transparent' color behavior for the item's bg
 color;   with this as the default color, Fl_Tree::color() can control the
 tree's background.   Tests added to the test/tree application.

o test/tree.fl modified:
    o Added a 'Test Suggestions' button to document various tests
    o Added tests for new 'transparent' color behavior
    o Added test for STR#2832 to check if items can be drawn to the /right/ of child widgets

o Added new methods to Fl_Tree_Prefs:
    item_labelfont()     -- obsoletes labelfont()
    item_labelsize()     -- obsoletes labelsize()
    item_labelfgcolor()  -- obsoletes labelfgcolor()
    item_labelbgcolor()  -- obsoletes labelbgcolor()

o Added 'Fonts and Colors' section to Fl_Tree docs

o Fl_Tree_Item ABI feature added: using bitflags instead of chars
  to keep the class small, as it gets instanced a lot. (fast + LIGHT)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9478 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Tree_Prefs.cxx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/Fl_Tree_Prefs.cxx')

diff --git a/src/Fl_Tree_Prefs.cxx b/src/Fl_Tree_Prefs.cxx
index 7f4a5337b..02d1aed61 100644
--- a/src/Fl_Tree_Prefs.cxx
+++ b/src/Fl_Tree_Prefs.cxx
@@ -5,7 +5,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Pixmap.H>
 #include <FL/Fl_Tree_Prefs.H>
-#include <string.h>
+#include <string.h>		// strcmp
 
 //////////////////////
 // Fl_Tree_Prefs.cxx
@@ -44,7 +44,7 @@ static const char *L_open_xpm[] = {
   "...@@@.....",
   "...@@......",
   "...@......."
-#else
+#else /* __APPLE__ */
   "11 11 3 1",
   ".	c #fefefe",
   "#	c #444444",
@@ -60,7 +60,7 @@ static const char *L_open_xpm[] = {
   "#.........#",
   "#.........#",
   "###########"
-#endif
+#endif /* __APPLE__ */
 };
 static Fl_Pixmap L_openpixmap(L_open_xpm);
 
@@ -80,7 +80,7 @@ static const char *L_close_xpm[] = {
   "...@@@@@...",
   "....@@@....",
   ".....@....."
-#else
+#else /* __APPLE__ */
   "11 11 3 1",
   ".	c #fefefe",
   "#	c #444444",
@@ -96,7 +96,7 @@ static const char *L_close_xpm[] = {
   "#.........#",
   "#.........#",
   "###########"
-#endif
+#endif /* __APPLE__ */
 };
 static Fl_Pixmap L_closepixmap(L_close_xpm);
 
@@ -127,22 +127,22 @@ Fl_Tree_Prefs::Fl_Tree_Prefs() {
   _margintop              = 3;
 #if FLTK_ABI_VERSION >= 10302
   _marginbottom           = 20;
-#endif
+#endif /*FLTK_ABI_VERSION*/
   _openchild_marginbottom = 0;
   _usericonmarginleft     = 3;
   _labelmarginleft        = 3;
 #if FLTK_ABI_VERSION >= 10302
   _widgetmarginleft       = 3;
-#endif
+#endif /*FLTK_ABI_VERSION*/
   _linespacing            = 0;
   _labelfgcolor           = FL_BLACK;
-  _labelbgcolor           = FL_WHITE;
+  _labelbgcolor           = 0xffffffff;		// we use this as 'transparent'
   _connectorcolor         = Fl_Color(43);
 #ifdef __APPLE__
   _connectorstyle         = FL_TREE_CONNECTOR_NONE;
-#else
+#else /* __APPLE__ */
   _connectorstyle         = FL_TREE_CONNECTOR_DOTTED;
-#endif
+#endif /* __APPLE__ */
   _openimage              = &L_openpixmap;
   _closeimage             = &L_closepixmap;
   _userimage              = 0;
-- 
cgit v1.2.3