Path: utzoo!utgpu!news-server.csri.toronto.edu!rpi!zaphod.mps.ohio-state.edu!swrinde!elroy.jpl.nasa.gov!decwrl!stanford.edu!leland.Stanford.EDU!portia!tang
From: tang@braun.stanford.edu (Steve Tang)
Newsgroups: comp.windows.interviews
Subject: Re: IV 3.0B ibuild problems
Message-ID: <TANG.91May21174232@braun.stanford.edu>
Date: 21 May 91 22:42:32 GMT
References: <1991May21.050944.5244@ge-dab.GE.COM>
Sender: news@leland.Stanford.EDU (Mr News)
Distribution: comp
Organization: Stanford University
Lines: 68
In-Reply-To: mcdowell@grus.cs.nps.navy.mil's message of 21 May 91 05:09:44 GMT


Here's the fix.

Steven Tang
tang@interviews.stanford.edu

/****/

The call to RecurGetConflict to find out potential conflicting names
in the user interface instance hierarchy may exit prematurely, causing
the system to complain about unrecognized instance names.

Apply with "patch -p -N < fix10" at the top of the source tree

*** iv/src/bin/ibuild/ibvarviews.c.orig	Tue May 21 16:52:37 1991
--- iv/src/bin/ibuild/ibvarviews.c	Tue May 21 16:55:47 1991
***************
*** 121,127 ****
  	}
      }
      delete flist;
!     RecurGetConflict(name, ulist, firewall, global);
      return ulist;
  }
  
--- 121,129 ----
  	}
      }
      delete flist;
!     if (firewall->IsA(SCENE_COMP)) {
!         RecurGetConflict(name, ulist, firewall, global);
!     }
      return ulist;
  }
  
***************
*** 128,136 ****
  void IBVarView::RecurGetConflict(
      const char* name, UList* ulist, InteractorComp* icomp, boolean global
  ) {
-     if (!global && icomp->IsA(MONOSCENE_CLASS)) {
-         return;
-     }
      Iterator i;
      for(icomp->First(i); !icomp->Done(i); icomp->Next(i)) {
  	InteractorComp* kid = (InteractorComp*) icomp->GetComp(i);
--- 130,135 ----
***************
*** 147,153 ****
  	    }
  	}
  	delete kidlist;
! 	RecurGetConflict(name, ulist, kid, global);
      }
  }
  
--- 146,156 ----
  	    }
  	}
  	delete kidlist;
!         if (!global && kid->IsA(MONOSCENE_CLASS)) {
!             return;
!         } else if (kid->IsA(SCENE_COMP)) {
!             RecurGetConflict(name, ulist, kid, global);
!         }
      }
  }