[fltk.commit] [Library] r8346 - branches/branch-1.3/test

[fltk-dev]

Author: greg.ercolano
Date: 2011-01-31 16:08:45 -0800 (Mon, 31 Jan 2011)
New Revision: 8346
Log:
Avoid non-ansi scoping issue with variables defined inside for() loops.



Modified:
   branches/branch-1.3/test/tree.fl

Modified: branches/branch-1.3/test/tree.fl
===================================================================
--- branches/branch-1.3/test/tree.fl    2011-01-31 18:04:09 UTC (rev 8345)
+++ branches/branch-1.3/test/tree.fl    2011-02-01 00:08:45 UTC (rev 8346)
@@ -666,7 +666,7 @@
 
 // Do selected items
 int count = 0;
-for ( Fl_Tree_Item *item=tree->first(); item; item = tree->next(item) ) {
+for ( item=tree->first(); item; item = tree->next(item) ) {
     if ( item->is_selected() ) {
         item->labelfont(val);
         count++;
@@ -675,7 +675,7 @@
 
 // No items selected? Do all..
 if ( ! count ) {
-    for ( Fl_Tree_Item *item=tree->first(); item; item = tree->next(item) ) {
+    for ( item=tree->first(); item; item = tree->next(item) ) {
         item->labelfont(val);
     }
 }
@@ -756,7 +756,8 @@
 
 // DO SELECTED ITEMS
 int count = 0;
-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) ) {
     if ( item->is_selected() ) {
         item->labelsize(size);
         count++;
@@ -765,7 +766,7 @@
 
 // NO ITEMS SELECTED? DO ALL
 if ( ! count ) {
-    for ( Fl_Tree_Item *item=tree->first(); item; item = tree->next(item) ) {
+    for ( item=tree->first(); item; item = tree->next(item) ) {
         item->labelsize(size);
     }
 }
@@ -789,7 +790,7 @@
 
 // Do selected items
 int count = 0;
-for ( Fl_Tree_Item *item=tree->first(); item; item = tree->next(item) ) {
+for ( item=tree->first(); item; item = tree->next(item) ) {
     if ( item->is_selected() ) {
         item->labelfgcolor(val);
         count++;
@@ -798,7 +799,7 @@
 
 // No items selected? Do all..
 if ( ! count ) {
-    for ( Fl_Tree_Item *item=tree->first(); item; item = tree->next(item) ) {
+    for ( item=tree->first(); item; item = tree->next(item) ) {
         item->labelfgcolor(val);
     }
 }
@@ -819,7 +820,7 @@
 
 // Do selected items
 int count = 0;
-for ( Fl_Tree_Item *item=tree->first(); item; item = tree->next(item) ) {
+for ( item=tree->first(); item; item = tree->next(item) ) {
     if ( item->is_selected() ) {
         item->labelbgcolor(val);
         count++;
@@ -828,7 +829,7 @@
 
 // No items selected? Do all..
 if ( ! count ) {
-    for ( Fl_Tree_Item *item=tree->first(); item; item = tree->next(item) ) {
+    for ( item=tree->first(); item; item = tree->next(item) ) {
         item->labelbgcolor(val);
     }
 }
@@ -851,8 +852,9 @@
         label { Deactivate}
         callback {int onoff = deactivate_toggle->value() ? 0 : 1;
 
+Fl_Tree_Item *item;
 int count = 0;
-for ( Fl_Tree_Item *item=tree->first(); item; item = tree->next(item) ) {
+for ( item=tree->first(); item; item = tree->next(item) ) {
     if ( item->is_selected() ) {
         item->activate(onoff);
         ++count;
@@ -860,7 +862,7 @@
 }
 
 if ( count == 0 ) {
-    for ( Fl_Tree_Item *item=tree->first(); item; item = tree->next(item) ) {
+    for ( item=tree->first(); item; item = tree->next(item) ) {
         item->activate(onoff);
     }
 }
@@ -875,7 +877,8 @@
 
 // DO SELECTED ITEMS
 int count = 0;
-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) ) {
     if ( item->is_selected() ) {
         item->labelfont(face);
         count++;
@@ -884,7 +887,7 @@
 
 // NO ITEMS SELECTED? DO ALL
 if ( ! count ) {
-    for ( Fl_Tree_Item *item=tree->first(); item; item = tree->next(item) ) {
+    for ( item=tree->first(); item; item = tree->next(item) ) {
         item->labelfont(face);
     }
 }

_______________________________________________
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit