1998-02-27  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* main.m: Include simtoolsgui.h instead of simtools.h.

	* MousetrapObserverSwarm.m: Don't include collections.h or
	objectbase.h.  Include simtoolsgui.h.

	* MousetrapObserverSwarm.h: Don't include objectbase.h, space.h,
	activity.h, collections.h, or simtools.h.  Include
	simtoolsgui/GUISwarm.h.

	* MousetrapModelSwarm.m: Include simtoolsgui.h.

1998-02-04  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapModelSwarm.h: Include from objectbase/ instead of
	swarmobject/.  Include objectbase.h instead of swarmobject.h.

	* Mousetrap.h, MousetrapBatchSwarm.h, MousetrapObserverSwarm.[hm]:
	Include objectbase.h instead of swarmobject.h.

1998-01-27  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* main.m (main): Constify argv.

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm
	-buildObjects]): Use Colormap not XColormap for colormap.  Revert
	GUI_ButtonRight change.

1998-01-24  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapObserverSwarm.m:  Include gui.h.
	([MousetrapObserverSwarm -buildObjects]): Send waitForControlEvent
	to actionCache. Use GUI_ButtonRight instead of ButtonRight.

	* MousetrapObserverSwarm.h (MousetrapObserverSwarm): Make
	colormap conform to Colormap protocol instead of being statically
	typed to XColormap.  Make displayWindow conform to the ZoomRaster
	protocol instead of being statically typed.

	* MousetrapObserverSwarm.h: Include gui.h instead of tkobjc.h.

	* Mousetrap.m: Don't include tkobjc.h.
	Reformatting throughout.

1998-01-15  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm
	-buildObjects]): Use SET_WINDOW_GEOMETRY_RECORD_NAME for
	triggerGraph and displayWindow.

	* main.m (main): Likewise, but for theTopLevelSwarm.

1998-01-14  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm -_update_]):
	Checks to see that there is still a displayWindow before
	attempting the draw it.
	([MousetrapObserverSwarm -_updateMousetraps_:]): New method that
	draws all the mousetraps unless there isn't a display window (the
	argument), and sets a trap's display widget.
	([MousetrapObserverSwarm -_displayWindowDeath_:]): New method
	called on destruction of display windows.  Has the effect of
	clearing all the display widgets.
	([MousetrapObserverSwarm -buildObjects]): Call
	enableDestroyNotification using our _displayWindowDeath_ as a
	handler.  Call _updateMousetraps_ (code that was inline).
	([MousetrapObserverSwarm -buildActions]): Use action that
	calls our _update_ instead of displayWindow's drawSelf.

1998-01-13  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapModelSwarm.m ([MousetrapModelSwarm -activateIn:]): Use
	CREATE_ARCHIVED_PROBE_DISPLAY to create probe display for
	modelActCont.

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm -buildObjects]): 
	Likewise, but for mousetrapModelSwarm and MousetrapObserverSwarm.
	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm -activateIn:]): 
	Likewise, but for observerActCont.

	* Makefile (SWARMHOME): Don't define if already defined.  Default is
	swarm-1.0.5.

	* MousetrapModelSwarm.m: Use setWindowGeometryRecordName version
	of createProbeDisplayFor for the model activity controller.

	* MousetrapObserverSwarm.m ([MousetrapObserverSwarm -buildObjects]): 
	Likewise for mousetrapModelSwarm, mousetrapObserverSwarm,
	and the observer activity controller.
	Call setWindowGeometryRecordName for triggerGraph, and mousetrapWorld.

	* MousetrapModelSwarm.[hm]: Reformatting throughout.
	* MousetrapObserverSwarm.[hm]: Likewise.
	* MousetrapBatchSwarm.[hm]: Likewise.

1997-12-20  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapObserverSwarm.m: Send doTkEvents to actionCache, not
	controlPanel.

1997-12-10  Marcus G. Daniels  <mgd@wijiji.santafe.edu>

	* MousetrapModelSwarm.m: Switch from ProbeMap * to id <ProbeMap>
	declaration for probeMap.
	
	* MousetrapObserverSwarm.m: Likewise.

