*** menu.c	Fri Nov 20 14:22:43 1992
--- menu.orig.c	Fri Nov 20 14:21:50 1992
***************
*** 34,46 ****
      int bwidth = SUIT_getInteger (menu, BORDER_WIDTH);
      rectangle loc, mloc;
      int xdiff, ydiff;
-     int xwidth, yheight;
  
- /* Begin Jerry 1 of 2 */
-     xwidth = SUIT_deluxeGetInteger(0, SCREEN_WIDTH, GLOBAL); 	/* Get screen size */
-     yheight = SUIT_deluxeGetInteger(0, SCREEN_HEIGHT, GLOBAL);
- /* End Jerry 1 of 2 */
- 
      loc = SUIT_mapViewportToScreen (button, OBJECT_VIEWPORT(button));
      mloc = SUIT_mapViewportToScreen (menu, OBJECT_VIEWPORT(menu));
      xdiff = mloc.bottom_left.x - loc.bottom_left.x;
--- 34,40 ----
***************
*** 47,73 ****
      ydiff = mloc.top_right.y - loc.bottom_left.y + 2*bwidth + 1;
      mloc.bottom_left.x -= xdiff;    mloc.top_right.x -= xdiff;
      mloc.bottom_left.y -= ydiff;    mloc.top_right.y -= ydiff;
- 
- /* Begin Jerry 2 of 2 */
- 	if(mloc.bottom_left.x < 0) {					/* Check and fix the lower coords */
- 		mloc.top_right.x += (mloc.bottom_left.x * -1);	/* so the menu fits on the display */
- 		mloc.bottom_left.x = 0;
- 	}
- 	if(mloc.bottom_left.y < 0) { 
- 		mloc.top_right.y += (mloc.bottom_left.y * -1);
- 		mloc.bottom_left.y = 0;
- 	}
- 
- 	if(mloc.top_right.x > xwidth)  { 				/* Check and fix the upper coords */
- 		mloc.bottom_left.x -= mloc.top_right.x - xwidth;/* so the menu fits on the display */
- 		mloc.top_right.x -= mloc.top_right.x - xwidth;
- 	}
- 	if(mloc.top_right.y >= yheight) {
- 		mloc.bottom_left.y -= mloc.top_right.y - yheight;
- 		mloc.top_right.y -= mloc.top_right.y - yheight;
- 	}
- /* End Jerry 2 of 2 */
- 
      SUIT_setViewport (menu, VIEWPORT, SUIT_mapScreenToViewport(menu, mloc));
      SUIT_bringToFront (menu);
  }
--- 41,46 ----
***************
*** 434,437 ****
      SUIT_addChildToObject (obj, button);
      return button;
  }
- 
--- 407,409 ----
