wip

1 files changed, 14 insertions, 8 deletions

diff --git a/src/Fl_Browser_.cxx b/src/Fl_Browser_.cxx
index 56b751415..eee2369b0 100644
--- a/src/Fl_Browser_.cxx
+++ b/src/Fl_Browser_.cxx
@@ -227,7 +227,8 @@ void Fl_Browser_::hposition(int pos) {
 int Fl_Browser_::displayed(void* item) const {
   int X, Y, W, H; bbox(X, Y, W, H);
   int yy = H+offset_;
-  for (void* l = top_; l && yy > 0; l = item_next(l)) {
+  void *l;
+  for (l = top_; l && yy > 0; l = item_next(l)) {
     if (l == item) return 1;
     yy -= item_height(l) + linespacing();
   }
@@ -583,7 +584,8 @@ void* Fl_Browser_::find_item(int ypos) {
   update_top();
   int X, Y, W, H; bbox(X, Y, W, H);
   int yy = Y-offset_;
-  for (void *l = top_; l; l = item_next(l)) {
+  void *l;
+  for (l = top_; l; l = item_next(l)) {
     int hh = item_height(l); if (hh <= 0) continue;
     yy += hh + linespacing();
     if (ypos <= yy || yy>=(Y+H)) return l;
@@ -649,7 +651,8 @@ int Fl_Browser_::select(void* item, int val, int docallbacks) {
 int Fl_Browser_::deselect(int docallbacks) {
   if (type() == FL_MULTI_BROWSER) {
     int change = 0;
-    for (void* p = item_first(); p; p = item_next(p))
+    void *p;
+    for (p = item_first(); p; p = item_next(p))
       change |= select(p, 0, docallbacks);
     return change;
   } else {
@@ -673,7 +676,8 @@ int Fl_Browser_::select_only(void* item, int docallbacks) {
   int change = 0;
   Fl_Widget_Tracker wp(this);
   if (type() == FL_MULTI_BROWSER) {
-    for (void* p = item_first(); p; p = item_next(p)) {
+    void *p;
+    for (p = item_first(); p; p = item_next(p)) {
       if (p != item) change |= select(p, 0, docallbacks);
       if (wp.deleted()) return change;
     }
@@ -833,19 +837,20 @@ J1:
         // see which of the new item or previous selection is earlier,
         // by searching from the previous forward for this one:
         int down;
+        void *m;
         if (!l) down = 1;
-        else {for (void* m = selection_; ; m = item_next(m)) {
+        else {for (m = selection_; ; m = item_next(m)) {
           if (m == l) {down = 1; break;}
           if (!m) {down = 0; break;}
         }}
         if (down) {
-          for (void* m = selection_; m != l; m = item_next(m)) {
+          for (m = selection_; m != l; m = item_next(m)) {
             select(m, whichway, when() & FL_WHEN_CHANGED);
             if (wp.deleted()) return 1;
           }
         } else {
           void* e = selection_;
-          for (void* m = item_next(l); m; m = item_next(m)) {
+          for (m = item_next(l); m; m = item_next(m)) {
             select(m, whichway, when() & FL_WHEN_CHANGED);
             if (wp.deleted()) return 1;
             if (m == e) break;
@@ -1066,7 +1071,8 @@ int Fl_Browser_::incr_height() const {
 */
 int Fl_Browser_::full_height() const {
   int t = 0;
-  for (void* p = item_first(); p; p = item_next(p))
+  void *p;
+  for (p = item_first(); p; p = item_next(p))
     t += item_quick_height(p);
   return t;
 }