*** 1.11	1995/05/09 17:54:52
--- BUGREPORT	1995/06/14 21:22:21
***************
*** 48,54 ****
  YOUR NAME:
  YOUR E-MAIL ADDRESS:
  
! VERSION OF XMT: 		2.1.0
  HARDWARE AND OPERATING SYSTEM: 	(eg: Sun 4, SunOS 4.1.2)
  X LIBRARIES:			(Are you using X11R4 or X11R5?)
  MOTIF LIBRARY:			(Which version of Motif?  eg. 1.1.4 or 1.2.1)
--- 48,54 ----
  YOUR NAME:
  YOUR E-MAIL ADDRESS:
  
! VERSION OF XMT: 		2.1.1
  HARDWARE AND OPERATING SYSTEM: 	(eg: Sun 4, SunOS 4.1.2)
  X LIBRARIES:			(Are you using X11R4 or X11R5?)
  MOTIF LIBRARY:			(Which version of Motif?  eg. 1.1.4 or 1.2.1)
*** 1.19	1995/06/04 17:34:12
--- CHANGES	1995/06/14 21:23:25
***************
*** 3,8 ****
--- 3,30 ----
  make any sense of it.  See README.210 for an overview of important
  changes. 
  
+ 		     Changes for Xmt 2.1, patchlevel 1
+ -----------------------------------------------------------------------------
+ This patch affects only the Motif 2.0 version of Xmt.
+ 
+ VERSION: updated to 2.1.1
+ BUGREPORT: updated version number to 2.1.1
+ Xmt.h: updated XmtPATCHLEVEL to 1
+ 
+ Layout.c, LayoutString.c: 
+ 	These files used XtAllocateGC() instead of XtGetGC() in the
+ 	Motif 2.0 version, and this caused problems with the rest of 
+ 	the code written for earlier versions of Motif.  They've been
+ 	changed to use XtGetGC() again.
+ 
+ PixmapCvt.c: 
+ 	Motif 2.0 has defined several new representation types for
+ 	pixmaps.  XmtRegisterPixmapConverter() now registers the Xmt
+ 	converter for three new types:  XmRLargeIconPixmap, 
+ 	XmRSmallIconPixmap, and XmRDynamicPixmap.
+ 	
+ 
+ 
  			Changes for Xmt Version 2.1
  -----------------------------------------------------------------------------
  VERSION: updated to 2.1.0
*** 1.8	1995/05/09 17:57:06
--- VERSION	1995/06/14 21:22:02
***************
*** 1 ****
! 2.1.0
--- 1 ----
! 2.1.1
*** 2.31	1995/05/20 01:01:49
--- Xmt/Layout.c	1995/06/14 21:12:33
***************
*** 1,6 ****
  /* 
   * Motif Tools Library, Version 2.0
!  * $Id: Layout.c,v 2.31 1995/05/20 01:01:49 david Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992, 1993, 1994 by Dovetail Systems.
--- 1,6 ----
  /* 
   * Motif Tools Library, Version 2.0
!  * $Id: Layout.c,v 2.32 1995/06/14 21:12:31 david Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992, 1993, 1994 by Dovetail Systems.
***************
*** 385,398 ****
      gcv.graphics_exposures = False;
      mask = GCForeground | GCBackground | GCFont | GCLineWidth |
  	GCGraphicsExposures;
- 
- #if XmVersion < 2000
      lw->layout.gc = XtGetGC((Widget)lw, mask, &gcv);
- #else /* Motif 2.0 or later */
-     lw->layout.gc = XtAllocateGC((Widget) lw, 0, mask, &gcv,
- 				 GCClipMask | GCClipXOrigin | GCClipYOrigin,
- 				 0);
- #endif
  
      /*
       * We could remember this bitmap and free it when the Layout is destroyed,
--- 385,391 ----
***************
*** 402,414 ****
      gcv.stipple = XmtLookupBitmap((Widget)lw, "_xmt_gray50");
      mask |= GCFillStyle | GCStipple;
  
- #if XmVersion < 2000
      lw->layout.grey_gc = XtGetGC((Widget)lw, mask, &gcv);
- #else /* Motif 2.0 or later */  
-     lw->layout.grey_gc = XtAllocateGC((Widget) lw, 0, mask, &gcv,
- 				      GCClipMask | GCClipXOrigin
- 				      | GCClipYOrigin, 0);
- #endif
  }
  
  /* ARGSUSED */
--- 395,401 ----
*** 2.15	1995/04/20 20:57:39
--- Xmt/LayoutString.c	1995/06/14 21:14:06
***************
*** 1,6 ****
  /* 
   * Motif Tools Library, Version 2.0
!  * $Id: LayoutString.c,v 2.15 1995/04/20 20:57:39 david Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992, 1993, 1994 by Dovetail Systems.
--- 1,6 ----
  /* 
   * Motif Tools Library, Version 2.0
!  * $Id: LayoutString.c,v 2.16 1995/06/14 21:14:06 david Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992, 1993, 1994 by Dovetail Systems.
***************
*** 126,141 ****
  	/* we need to specify some font so XmDrawString() doesn't barf */
  	gcv.font = lw->layout.font->fid;
  
- #if XmVersion < 2000    
  	ls->layout_string.gc = XtGetGC((Widget)ls,
  				       GCForeground | GCBackground | GCFont,
  				       &gcv);
- #else
- 	ls->layout_string.gc =
- 	    XtAllocateGC((Widget) lw, 0,
- 			 GCForeground | GCBackground| GCFont, &gcv,
- 			 GCClipMask | GCClipXOrigin | GCClipYOrigin, 0);
- #endif
      }
  }
  
--- 126,134 ----
*** 2.10	1994/07/04 03:03:50
--- Xmt/PixmapCvt.c	1995/06/14 21:17:08
***************
*** 1,6 ****
  /* 
   * Motif Tools Library, Version 2.0
!  * $Id: PixmapCvt.c,v 2.10 1994/07/04 03:03:50 david Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992, 1993, 1994 by Dovetail Systems.
--- 1,6 ----
  /* 
   * Motif Tools Library, Version 2.0
!  * $Id: PixmapCvt.c,v 2.11 1995/06/14 21:17:08 david Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992, 1993, 1994 by Dovetail Systems.
***************
*** 63,68 ****
--- 63,75 ----
      XmRPrimForegroundPixmap,
      XmRManForegroundPixmap,
      XmRGadgetPixmap
+ #if XmVersion >= 2000
+     ,
+     XmRLargeIconPixmap ,
+     XmRSmallIconPixmap,
+     XmRDynamicPixmap
+ #endif
+     
  };
  
  #if NeedFunctionPrototypes
*** 2.23	1995/06/04 17:31:08
--- Xmt/Xmt.h	1995/06/14 21:22:50
***************
*** 1,6 ****
  /* 
   * Motif Tools Library, Version 2.0
!  * $Id: Xmt.h,v 2.23 1995/06/04 17:31:08 david Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992, 1993, 1994 by Dovetail Systems.
--- 1,6 ----
  /* 
   * Motif Tools Library, Version 2.0
!  * $Id: Xmt.h,v 2.24 1995/06/14 21:22:50 david Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992, 1993, 1994 by Dovetail Systems.
***************
*** 43,49 ****
  #define XmtVERSION      2
  #define XmtREVISION     1
  #define XmtVersion      (XmtVERSION * 1000 + XmtREVISION)
! #define XmtPatchlevel   0
  
  /*
   * figure out what version of Xt we're using.
--- 43,49 ----
  #define XmtVERSION      2
  #define XmtREVISION     1
  #define XmtVersion      (XmtVERSION * 1000 + XmtREVISION)
! #define XmtPatchlevel   1
  
  /*
   * figure out what version of Xt we're using.