wip

1 files changed, 41 insertions, 23 deletions

diff --git a/src/Fl_Tree.cxx b/src/Fl_Tree.cxx
index 01ab99d33..d4f1be750 100644
--- a/src/Fl_Tree.cxx
+++ b/src/Fl_Tree.cxx
@@ -67,7 +67,8 @@ static void free_path(char **arr) {
 //
 static int find_total_children(Fl_Tree_Item *item, int count=0) {
   count++;
-  for ( int t=0; t<item->children(); t++ ) {
+  int t;
+  for (t =0; t<item->children(); t++ ) {
     count = find_total_children(item->child(t), count);
   }
   return(count);
@@ -138,7 +139,8 @@ Fl_Tree::~Fl_Tree() {
 int Fl_Tree::extend_selection_dir(Fl_Tree_Item *from, Fl_Tree_Item *to,
                                   int dir, int val, bool visible ) {
   int changed = 0;
-  for (Fl_Tree_Item *item=from; item; item = next_item(item, dir, visible) ) {
+  Fl_Tree_Item *item;
+  for (item =from; item; item = next_item(item, dir, visible) ) {
     switch (val) {
       case 0:
         if ( deselect(item, when()) ) ++changed;
@@ -193,8 +195,9 @@ int Fl_Tree::extend_selection(Fl_Tree_Item *from, Fl_Tree_Item *to,
     }
     return(changed);
   }
+  Fl_Tree_Item *item;
   char on = 0;
-  for ( Fl_Tree_Item *item = first(); item; item = item->next_visible(_prefs) ) {
+  for (item = first(); item; item = item->next_visible(_prefs) ) {
     if ( visible && !item->is_visible() ) continue;
     if ( on || (item == from) || (item == to) ) {
       switch (val) {
@@ -1099,11 +1102,12 @@ Fl_Tree_Item* Fl_Tree::item_clicked() {
  \code
  :
  // Walk down the tree (forwards)
- for ( Fl_Tree_Item *i=tree->first_visible_item(); i; i=tree->next_visible_item(i, FL_Down) )
+ Fl_Tree_Item *i;
+ for (i =tree->first_visible_item(); i; i=tree->next_visible_item(i, FL_Down) )
      printf("Item: %s\n", i->label());
 
  // Walk up the tree (backwards)
- for ( Fl_Tree_Item *i=tree->last_visible_item(); i; i=tree->next_visible_item(i, FL_Up) )
+ for (i =tree->last_visible_item(); i; i=tree->next_visible_item(i, FL_Up) )
      printf("Item: %s\n", i->label());
  :
  \endcode
@@ -1123,7 +1127,8 @@ Fl_Tree_Item *Fl_Tree::next_visible_item(Fl_Tree_Item *item, int dir) {
  \par
  \code
  :
- for ( Fl_Tree_Item *item = tree->first(); item; item = tree->next(item) )
+ Fl_Tree_Item *item;
+ for (item = tree->first(); item; item = tree->next(item) )
      printf("Item: %s\n", item->label());
  :
  \endcode
@@ -1161,7 +1166,8 @@ Fl_Tree_Item* Fl_Tree::first_visible_item() {
  \par
  \code
  :
- for ( Fl_Tree_Item *i = tree->first(); i; i = tree->next(i) )
+ Fl_Tree_Item *i;
+ for (i = tree->first(); i; i = tree->next(i) )
      printf("Item: %s\n", i->label());
  :
  \endcode
@@ -1180,7 +1186,8 @@ Fl_Tree_Item *Fl_Tree::next(Fl_Tree_Item *item) {
  \par
  \code
  :
- for ( Fl_Tree_Item *item = tree->first(); item; item = tree->prev(item) )
+ Fl_Tree_Item *item;
+ for (item = tree->first(); item; item = tree->prev(item) )
      printf("Item: %s\n", item->label());
  :
  \endcode
@@ -1198,7 +1205,8 @@ Fl_Tree_Item *Fl_Tree::prev(Fl_Tree_Item *item) {
  This can be used to walk the tree in reverse, e.g.
  \par
  \code
- for ( Fl_Tree_Item *item = tree->last(); item; item = tree->prev() )
+ Fl_Tree_Item *item;
+ for (item = tree->last(); item; item = tree->prev() )
      printf("Item: %s\n", item->label());
  \endcode
  \returns Last item in the tree, or 0 if none (tree empty).
@@ -1249,7 +1257,8 @@ Fl_Tree_Item* Fl_Tree::last_visible_item() {
  \code
  :
  // Walk tree forward, from top to bottom
- for ( Fl_Tree_Item *i=tree->first_selected_item(); i; i=tree->next_selected_item(i) )
+ Fl_Tree_Item *i;
+ for (i =tree->first_selected_item(); i; i=tree->next_selected_item(i) )
      printf("Selected item: %s\n", i->label());
  :
  \endcode
@@ -1270,7 +1279,8 @@ Fl_Tree_Item *Fl_Tree::first_selected_item() {
  \code
  :
  // Walk tree in reverse, from bottom to top
- for ( Fl_Tree_Item *i=tree->last_selected_item(); i; i=tree->next_selected_item(i, FL_Up) )
+ Fl_Tree_Item *i;
+ for (i =tree->last_selected_item(); i; i=tree->next_selected_item(i, FL_Up) )
      printf("Selected item: %s\n", i->label());
  :
  \endcode
@@ -1303,19 +1313,20 @@ Fl_Tree_Item *Fl_Tree::last_selected_item() {
  \code
  :
  // Walk down the tree showing open(), visible items
- for ( Fl_Tree_Item *i=tree->first_visible_item(); i; i=tree->next_item(i, FL_Down, true) )
+ Fl_Tree_Item *i;
+ for (i =tree->first_visible_item(); i; i=tree->next_item(i, FL_Down, true) )
      printf("Item: %s\n", i->label());
 
  // Walk up the tree showing open(), visible items
- for ( Fl_Tree_Item *i=tree->last_visible_item(); i; i=tree->next_item(i, FL_Up, true) )
+ for (i =tree->last_visible_item(); i; i=tree->next_item(i, FL_Up, true) )
      printf("Item: %s\n", i->label());
 
  // Walk down the tree showing all items (open or closed)
- for ( Fl_Tree_Item *i=tree->first(); i; i=tree->next_item(i, FL_Down, false) )
+ for (i =tree->first(); i; i=tree->next_item(i, FL_Down, false) )
      printf("Item: %s\n", i->label());
 
  // Walk up the tree showing all items (open or closed)
- for ( Fl_Tree_Item *i=tree->last(); i; i=tree->next_item(i, FL_Up, false) )
+ for (i =tree->last(); i; i=tree->next_item(i, FL_Up, false) )
      printf("Item: %s\n", i->label());
  :
  \endcode
@@ -1365,11 +1376,12 @@ Fl_Tree_Item *Fl_Tree::next_item(Fl_Tree_Item *item, int dir, bool visible) {
  \code
  :
  // Walk down the tree (forwards)
- for ( Fl_Tree_Item *i=tree->first_selected_item(); i; i=tree->next_selected_item(i, FL_Down) )
+ Fl_Tree_Item *i;
+ for (i =tree->first_selected_item(); i; i=tree->next_selected_item(i, FL_Down) )
      printf("Item: %s\n", i->label());
 
  // Walk up the tree (backwards)
- for ( Fl_Tree_Item *i=tree->last_selected_item(); i; i=tree->next_selected_item(i, FL_Up) )
+ for (i =tree->last_selected_item(); i; i=tree->next_selected_item(i, FL_Up) )
      printf("Item: %s\n", i->label());
  :
  \endcode
@@ -1419,7 +1431,8 @@ Fl_Tree_Item *Fl_Tree::next_selected_item(Fl_Tree_Item *item, int dir) {
    Fl_Tree_Item_Array items;
    tree->get_selected_items(items);
    // Manipulate the returned array
-   for ( int t=0; t<items.total(); t++ ) {
+   int t;
+   for (t =0; t<items.total(); t++ ) {
        Fl_Tree_Item &item = items[t];
        ..do stuff with each selected item..
    }
@@ -1432,7 +1445,8 @@ Fl_Tree_Item *Fl_Tree::next_selected_item(Fl_Tree_Item *item, int dir) {
 */
 int Fl_Tree::get_selected_items(Fl_Tree_Item_Array &ret_items) {
   ret_items.clear();
-  for ( Fl_Tree_Item *i=first_selected_item(); i; i=next_selected_item(i) ) {
+  Fl_Tree_Item *i;
+  for (i =first_selected_item(); i; i=next_selected_item(i) ) {
     ret_items.add(i);
   }
   return ret_items.total();
@@ -1821,7 +1835,8 @@ int Fl_Tree::deselect_all(Fl_Tree_Item *item, int docallback) {
     if ( deselect(item, docallback) )
       ++count;
   // Deselect its children
-  for ( int t=0; t<item->children(); t++ ) {
+  int t;
+  for (t =0; t<item->children(); t++ ) {
     count += deselect_all(item->child(t), docallback);  // recurse
   }
   return(count);
@@ -1852,7 +1867,8 @@ int Fl_Tree::select_only(Fl_Tree_Item *selitem, int docallback) {
   // Deselect everything first.
   //    Prevents callbacks from seeing more than one item selected.
   //
-  for ( Fl_Tree_Item *item = first(); item; item = item->next() ) {
+  Fl_Tree_Item *item;
+  for (item = first(); item; item = item->next() ) {
     if ( item == selitem ) continue;            // don't do anything to selitem yet..
     if ( item->is_selected() ) {
       deselect(item, docallback);
@@ -1898,7 +1914,8 @@ int Fl_Tree::select_all(Fl_Tree_Item *item, int docallback) {
     if ( select(item, docallback) )
       ++count;
   // Select its children
-  for ( int t=0; t<item->children(); t++ ) {
+  int t;
+  for (t =0; t<item->children(); t++ ) {
     count += select_all(item->child(t), docallback);    // recurse
   }
   return(count);
@@ -2490,7 +2507,8 @@ void Fl_Tree::hposition(int pos) {
  \par
  \code
  :
- for ( int i=0; i<tree->children(); i++ ) {    // walk children
+ int i;
+ for (i =0; i<tree->children(); i++ ) {    // walk children
      Fl_Widget *w = tree->child(i);
      if ( tree->is_scrollbar(w) ) continue;    // skip scrollbars
      ..do work here..