diff -bpcBNC 5 Xmt310/Xmt/All.c Xmt310.ge/Xmt/All.c
*** Xmt310/Xmt/All.c	Sun Feb  4 22:20:22 2001
--- Xmt310.ge/Xmt/All.c	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
diff -bpcBNC 5 Xmt310/Xmt/All.h Xmt310.ge/Xmt/All.h
*** Xmt310/Xmt/All.h	Sun Feb  4 22:19:48 2001
--- Xmt310.ge/Xmt/All.h	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtAll_h
  #define _XmtAll_h
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #ifndef _XmtAll_h
  #define _XmtAll_h
diff -bpcBNC 5 Xmt310/Xmt/AppRes.c Xmt310.ge/Xmt/AppRes.c
*** Xmt310/Xmt/AppRes.c	Sun Feb  4 22:31:28 2001
--- Xmt310.ge/Xmt/AppRes.c	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/AppResP.h>
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/AppResP.h>
diff -bpcBNC 5 Xmt310/Xmt/AppRes.h Xmt310.ge/Xmt/AppRes.h
*** Xmt310/Xmt/AppRes.h	Sun Feb  4 22:31:50 2001
--- Xmt310.ge/Xmt/AppRes.h	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtAppRes_h
  #define _XmtAppRes_h
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #ifndef _XmtAppRes_h
  #define _XmtAppRes_h
diff -bpcBNC 5 Xmt310/Xmt/AppResP.h Xmt310.ge/Xmt/AppResP.h
*** Xmt310/Xmt/AppResP.h	Sun Feb  4 22:32:46 2001
--- Xmt310.ge/Xmt/AppResP.h	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtAppResP_h
  #define _XmtAppResP_h
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #ifndef _XmtAppResP_h
  #define _XmtAppResP_h
diff -bpcBNC 5 Xmt310/Xmt/AskForBool.c Xmt310.ge/Xmt/AskForBool.c
*** Xmt310/Xmt/AskForBool.c	Sun Feb  4 22:33:02 2001
--- Xmt310.ge/Xmt/AskForBool.c	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <X11/IntrinsicP.h>
  #include <Xmt/Xmt.h>
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <X11/IntrinsicP.h>
  #include <Xmt/Xmt.h>
*************** static String button_names[] = {
*** 116,126 ****
      "Done", "DoneButton", "Help", "HelpButton",
      "No", "NoButton", "Ok", "OkButton", "Okay", "OkayButton",
      "Reset", "ResetButton", "Stop", "StopButton",
      "Yes", "YesButton",
  };
! static int button_values[] = {
      XmtApplyButton, XmtApplyButton, XmtCancelButton, XmtCancelButton,
      XmtDoneButton, XmtDoneButton, XmtHelpButton, XmtHelpButton,
      XmtNoButton, XmtNoButton, XmtOkButton, XmtOkButton,
      XmtOkButton, XmtOkButton, XmtResetButton, XmtResetButton,
      XmtStopButton, XmtStopButton, XmtYesButton, XmtYesButton,
--- 121,131 ----
      "Done", "DoneButton", "Help", "HelpButton",
      "No", "NoButton", "Ok", "OkButton", "Okay", "OkayButton",
      "Reset", "ResetButton", "Stop", "StopButton",
      "Yes", "YesButton",
  };
! static Cardinal button_values[] = {
      XmtApplyButton, XmtApplyButton, XmtCancelButton, XmtCancelButton,
      XmtDoneButton, XmtDoneButton, XmtHelpButton, XmtHelpButton,
      XmtNoButton, XmtNoButton, XmtOkButton, XmtOkButton,
      XmtOkButton, XmtOkButton, XmtResetButton, XmtResetButton,
      XmtStopButton, XmtStopButton, XmtYesButton, XmtYesButton,
*************** StringConst help_text_default;
*** 358,371 ****
  	data.icon_type = (unsigned char) icon_type_default;
  	data.help_text = (String) help_text_default;
      }
  
      /* create the XmStrings */
!     title = XmtCreateXmString(data.title);
!     yes_label = XmtCreateXmString(data.yes_label);
!     no_label = XmtCreateXmString(data.no_label);
!     cancel_label = XmtCreateXmString(data.cancel_label);
  
      /* set icon pixmap and message  */
      XtVaSetValues(info->boolean_internals.icon,
  		  XmtNpixmap, GetPixmap(info->boolean_dialog, data.icon_type),
  		  NULL);
--- 363,376 ----
  	data.icon_type = (unsigned char) icon_type_default;
  	data.help_text = (String) help_text_default;
      }
  
      /* create the XmStrings */
!     title = XmtCreateLocalizedXmString(w, data.title);
!     yes_label = XmtCreateLocalizedXmString(w, data.yes_label);
!     no_label = XmtCreateLocalizedXmString(w, data.no_label);
!     cancel_label = XmtCreateLocalizedXmString(w, data.cancel_label);
  
      /* set icon pixmap and message  */
      XtVaSetValues(info->boolean_internals.icon,
  		  XmtNpixmap, GetPixmap(info->boolean_dialog, data.icon_type),
  		  NULL);
diff -bpcBNC 5 Xmt310/Xmt/AskForFile.c Xmt310.ge/Xmt/AskForFile.c
*** Xmt310/Xmt/AskForFile.c	Sun Feb  4 22:06:32 2001
--- Xmt310.ge/Xmt/AskForFile.c	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <errno.h>
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <stdio.h>
  #include <errno.h>
***************
*** 21,30 ****
--- 26,36 ----
  #include <Xmt/ScreenP.h>
  #include <Xmt/DialogsP.h>
  #include <Xm/DialogS.h>
  #include <Xm/FileSB.h>
  #include <Xm/Text.h>
+ #include <Xm/List.h>
  
  /* ARGSUSED */
  #if NeedFunctionPrototypes
  static void OpenFileCallback(Widget w, XtPointer tag, XtPointer call_data)
  #else
*************** Boolean open_file;
*** 235,248 ****
      /* if the directory and pattern are from buffers, use them to override */
      if (!lookup_directory) data.directory = directory_buffer;
      if (!lookup_pattern) data.pattern = pattern_buffer;
  	
      /* create XmStrings */
!     message = XmtCreateXmString(data.message);
!     title = XmtCreateXmString(data.title);
!     directory = XmtCreateXmString(data.directory);
!     pattern = XmtCreateXmString(data.pattern);
  
      /*
       * Set XmNdirectory to NULL, so that the next call changes it
       * and forces the XmFileSelectionBox to re-selected the current dir.
       */
--- 241,254 ----
      /* if the directory and pattern are from buffers, use them to override */
      if (!lookup_directory) data.directory = directory_buffer;
      if (!lookup_pattern) data.pattern = pattern_buffer;
  	
      /* create XmStrings */
!     message = XmtCreateLocalizedXmString(w, data.message);
!     title = XmtCreateLocalizedXmString(w, data.title);
!     directory = XmtCreateLocalizedXmString(w, data.directory);
!     pattern = XmtCreateLocalizedXmString(w, data.pattern);
  
      /*
       * Set XmNdirectory to NULL, so that the next call changes it
       * and forces the XmFileSelectionBox to re-selected the current dir.
       */
diff -bpcBNC 5 Xmt310/Xmt/AskForItem.c Xmt310.ge/Xmt/AskForItem.c
*** Xmt310/Xmt/AskForItem.c	Sun Feb  4 22:33:22 2001
--- Xmt310.ge/Xmt/AskForItem.c	Tue Jun 12 18:11:32 2001
***************
*** 1,26 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ScreenP.h>
  #include <Xmt/DialogsP.h>
  #include <Xmt/Converters.h>
  #include <Xm/DialogS.h>
  #include <Xm/SelectioB.h>
  #include <Xm/Text.h>
  
  /* ARGSUSED */
  #if NeedFunctionPrototypes
  static void NoMatchCallback(Widget w, XtPointer tag, XtPointer data)
  #else
--- 1,32 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ScreenP.h>
  #include <Xmt/DialogsP.h>
  #include <Xmt/Converters.h>
  #include <Xm/DialogS.h>
  #include <Xm/SelectioB.h>
  #include <Xm/Text.h>
+ #include <Xm/List.h>
  
  /* ARGSUSED */
  #if NeedFunctionPrototypes
  static void NoMatchCallback(Widget w, XtPointer tag, XtPointer data)
  #else
*************** Boolean return_number;
*** 194,206 ****
  	data.help_text = (String) help_text_default;
  	data.visible_items = 8;  /* no argument for this one */
      }
  
      /* create the XmStrings */
!     message = XmtCreateXmString(data.message);
!     title = XmtCreateXmString(data.title);
!     list_title = XmtCreateXmString(data.list_title);
  
      /*
       * If we got an items string from the resource db,
       * it is NULL-terminated, and we need to count the number
       * of items.  Otherwise we can just use num_items_default.
--- 200,212 ----
  	data.help_text = (String) help_text_default;
  	data.visible_items = 8;  /* no argument for this one */
      }
  
      /* create the XmStrings */
!     message = XmtCreateLocalizedXmString(w, data.message);
!     title = XmtCreateLocalizedXmString(w, data.title);
!     list_title = XmtCreateLocalizedXmString(w, data.list_title);
  
      /*
       * If we got an items string from the resource db,
       * it is NULL-terminated, and we need to count the number
       * of items.  Otherwise we can just use num_items_default.
*************** Boolean return_number;
*** 213,228 ****
      }
  
      /* convert the list items to XmStrings */
      item_labels = (XmString *) XtMalloc(num_items * sizeof(XmString));
      for(i = 0; i < num_items; i++)
! 	item_labels[i] = XmtCreateXmString(data.items[i]);
  
      if (return_number)
  	default_item_label = item_labels[*int_return];
      else if (buffer_return && *buffer_return)
! 	default_item_label = XmtCreateXmString(buffer_return);
      else
  	default_item_label = item_labels[0];
  
      /* set resources on the dialog */
      XtVaSetValues(info->item_dialog,
--- 219,234 ----
      }
  
      /* convert the list items to XmStrings */
      item_labels = (XmString *) XtMalloc(num_items * sizeof(XmString));
      for(i = 0; i < num_items; i++)
! 	item_labels[i] = XmtCreateLocalizedXmString(w, data.items[i]);
  
      if (return_number)
  	default_item_label = item_labels[*int_return];
      else if (buffer_return && *buffer_return)
! 	default_item_label = XmtCreateLocalizedXmString(w, buffer_return);
      else
  	default_item_label = item_labels[0];
  
      /* set resources on the dialog */
      XtVaSetValues(info->item_dialog,
diff -bpcBNC 5 Xmt310/Xmt/AskForString.c Xmt310.ge/Xmt/AskForString.c
*** Xmt310/Xmt/AskForString.c	Sun Feb  4 22:33:28 2001
--- Xmt310.ge/Xmt/AskForString.c	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/Xmt.h>
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/Xmt.h>
*************** int type;
*** 233,243 ****
      VerifyCallbackStruct client_data_struct;
      String value;
      XmString message, title;
      Arg args[10];
      int i;
-     Widget text_widget;
      static String default_string_title;
      static String default_int_title;
      static String default_double_title;
      
      /* make sure the shell we pop up over is not a menu shell! */
--- 238,247 ----
*************** int type;
*** 322,333 ****
  	buffer_length = 50;
  	break;
      }
      
      /* set resources on the dialog box and the text widget within it. */
!     message = XmtCreateXmString(data.message);
!     title = XmtCreateXmString(data.title);
      i = 0;
      XtSetArg(args[i], XmNselectionLabelString, message); i++;
      XtSetArg(args[i], XmNdialogTitle, title); i++;
      XtSetValues(info->string_dialog, args, i);
      XmStringFree(message);
--- 326,337 ----
  	buffer_length = 50;
  	break;
      }
      
      /* set resources on the dialog box and the text widget within it. */
!     message = XmtCreateLocalizedXmString(w, data.message);
!     title = XmtCreateLocalizedXmString(w, data.title);
      i = 0;
      XtSetArg(args[i], XmNselectionLabelString, message); i++;
      XtSetArg(args[i], XmNdialogTitle, title); i++;
      XtSetValues(info->string_dialog, args, i);
      XmStringFree(message);
diff -bpcBNC 5 Xmt310/Xmt/AssertClass.c Xmt310.ge/Xmt/AssertClass.c
*** Xmt310/Xmt/AssertClass.c	Sun Feb  4 22:33:36 2001
--- Xmt310.ge/Xmt/AssertClass.c	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <X11/IntrinsicP.h>
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <X11/IntrinsicP.h>
*************** void XmtAssertWidgetClass(w, c, procname
*** 33,44 ****
  Widget w;
  WidgetClass c;
  String procname;
  #endif
  {
-     extern void abort();
-     
      if (!XtIsSubclass(w, c)) {
  	XmtWarningMsg("XmtAssertWidgetClass", "typeMismatch",
  		      "\n\tA widget of class %s was passed to procedure %s.\n\tA widget of class %s was expected.\n\tAborting.",
  		      XtClass(w)->core_class.class_name,
  		      procname,
--- 38,47 ----
diff -bpcBNC 5 Xmt310/Xmt/BSearch.c Xmt310.ge/Xmt/BSearch.c
*** Xmt310/Xmt/BSearch.c	Sun Feb  4 22:33:52 2001
--- Xmt310.ge/Xmt/BSearch.c	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  
diff -bpcBNC 5 Xmt310/Xmt/BitmapCvt.c Xmt310.ge/Xmt/BitmapCvt.c
*** Xmt310/Xmt/BitmapCvt.c	Sun Feb  4 22:34:04 2001
--- Xmt310.ge/Xmt/BitmapCvt.c	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Pixmap.h>
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Pixmap.h>
diff -bpcBNC 5 Xmt310/Xmt/Block.c Xmt310.ge/Xmt/Block.c
*** Xmt310/Xmt/Block.c	Sun Feb  4 22:34:10 2001
--- Xmt310.ge/Xmt/Block.c	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  
Common subdirectories: Xmt310/Xmt/CVS and Xmt310.ge/Xmt/CVS
diff -bpcBNC 5 Xmt310/Xmt/CallbackCvt.c Xmt310.ge/Xmt/CallbackCvt.c
*** Xmt310/Xmt/CallbackCvt.c	Sun Feb  4 22:34:24 2001
--- Xmt310.ge/Xmt/CallbackCvt.c	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ProceduresP.h>
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ProceduresP.h>
diff -bpcBNC 5 Xmt310/Xmt/CheckFormat.c Xmt310.ge/Xmt/CheckFormat.c
*** Xmt310/Xmt/CheckFormat.c	Sun Feb  4 22:34:30 2001
--- Xmt310.ge/Xmt/CheckFormat.c	Tue Jun 12 18:11:32 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <string.h>
--- 1,21 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.1  2001/06/12 15:00:21  andre
!  * AA-2001-06-12-0: replaced Xmt212 by Xmt310
!  *                  (http://sourceforge.net/projects/motiftools) with
!  *                  our xmt212 patches applied
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <string.h>
diff -bpcBNC 5 Xmt310/Xmt/Chooser.c Xmt310.ge/Xmt/Chooser.c
*** Xmt310/Xmt/Chooser.c	Sun Feb  4 22:34:50 2001
--- Xmt310.ge/Xmt/Chooser.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <string.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <string.h>
*************** static void CopyValues(XmtChooserWidget 
*** 505,515 ****
  static void CopyValues(cw)
  XmtChooserWidget cw;     
  #endif
  {
      char *values;
!     int size = cw->chooser.num_items * cw->chooser.value_size;
      
      /* if XmtNvalues is set, be sure to ignore XmtNvalueStrings */
      cw->chooser.value_strings = NULL;
  
      values = XtMalloc(size);
--- 508,518 ----
  static void CopyValues(cw)
  XmtChooserWidget cw;     
  #endif
  {
      char *values;
!     size_t size = cw->chooser.num_items * cw->chooser.value_size;
      
      /* if XmtNvalues is set, be sure to ignore XmtNvalueStrings */
      cw->chooser.value_strings = NULL;
  
      values = XtMalloc(size);
*************** static void ClassInitialize()
*** 582,592 ****
  #if XmVersion >= 2000
          "ComboBox",
  #endif
  	"Option", "RadioBox", "RadioList", "RadioPalette"
      };
!     static int values[] = {
  	XmtChooserButtonBox, XmtChooserCheckBox, XmtChooserCheckList,
  	XmtChooserCheckPalette,
  #if XmVersion >= 2000
          XmtChooserComboBox,
  #endif
--- 585,595 ----
  #if XmVersion >= 2000
          "ComboBox",
  #endif
  	"Option", "RadioBox", "RadioList", "RadioPalette"
      };
!     static Cardinal values[] = {
  	XmtChooserButtonBox, XmtChooserCheckBox, XmtChooserCheckList,
  	XmtChooserCheckPalette,
  #if XmVersion >= 2000
          XmtChooserComboBox,
  #endif
*************** Cardinal *num_args;
*** 813,823 ****
      /* create the label XmStrings in string mode */
      if (nw->chooser.label_type == XmSTRING) {
  	item_labels = (XmString *)
  	    XtMalloc(nw->chooser.num_items*sizeof(XmString));
  	for(i = 0; i < nw->chooser.num_items; i++)
! 	    item_labels[i] = XmtCreateXmString(nw->chooser.strings[i]);
      }
      
      /*
       * Create the widgets.  Option menus are handled separately.
       */
--- 816,826 ----
      /* create the label XmStrings in string mode */
      if (nw->chooser.label_type == XmSTRING) {
  	item_labels = (XmString *)
  	    XtMalloc(nw->chooser.num_items*sizeof(XmString));
  	for(i = 0; i < nw->chooser.num_items; i++)
! 	    item_labels[i] = XmtCreateLocalizedXmString((Widget) nw, nw->chooser.strings[i]);
      }
      
      /*
       * Create the widgets.  Option menus are handled separately.
       */
diff -bpcBNC 5 Xmt310/Xmt/Chooser.h Xmt310.ge/Xmt/Chooser.h
*** Xmt310/Xmt/Chooser.h	Sun Feb  4 22:34:56 2001
--- Xmt310.ge/Xmt/Chooser.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtChooser_h
  #define _XmtChooser_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtChooser_h
  #define _XmtChooser_h
*************** typedef enum {
*** 31,41 ****
  #endif	
  } XmtChooserType;
  
  typedef struct {
      int state;        /* selected item or OR of items */
!     int item;         /* whichever item just was clicked */
      XtPointer valuep; /* address of value from XmtNvalues array */
  } XmtChooserCallbackStruct;
  
  externalref WidgetClass xmtChooserWidgetClass;
  typedef struct _XmtChooserClassRec *XmtChooserWidgetClass;
--- 34,44 ----
  #endif	
  } XmtChooserType;
  
  typedef struct {
      int state;        /* selected item or OR of items */
!     Cardinal item;         /* whichever item just was clicked */
      XtPointer valuep; /* address of value from XmtNvalues array */
  } XmtChooserCallbackStruct;
  
  externalref WidgetClass xmtChooserWidgetClass;
  typedef struct _XmtChooserClassRec *XmtChooserWidgetClass;
diff -bpcBNC 5 Xmt310/Xmt/ChooserP.h Xmt310.ge/Xmt/ChooserP.h
*** Xmt310/Xmt/ChooserP.h	Sun Feb  4 22:35:02 2001
--- Xmt310.ge/Xmt/ChooserP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtChooserP_h
  #define _XmtChooserP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtChooserP_h
  #define _XmtChooserP_h
*************** typedef struct _XmtChooserClassRec {
*** 37,60 ****
  externalref XmtChooserClassRec xmtChooserClassRec;
      
  typedef struct _XmtChooserPart {
      /* resources */
      XmtChooserType type;
!     int num_items;
      String *strings;
      Pixmap *pixmaps;
      Pixmap *select_pixmaps;
      Pixmap *insensitive_pixmaps;
      XtPointer values;
      String *value_strings;
      String value_type;
!     int value_size;
      XmFontList font_list;
  #if XmVersion >= 2000
      XmRenderTable render_table;
  #endif
!     int visible_items;
      int state;
      String symbol_name;
      unsigned char label_type;
      XtCallbackList callback;
      Widget *item_widgets;
--- 40,63 ----
  externalref XmtChooserClassRec xmtChooserClassRec;
      
  typedef struct _XmtChooserPart {
      /* resources */
      XmtChooserType type;
!     Cardinal num_items;
      String *strings;
      Pixmap *pixmaps;
      Pixmap *select_pixmaps;
      Pixmap *insensitive_pixmaps;
      XtPointer values;
      String *value_strings;
      String value_type;
!     Cardinal value_size;
      XmFontList font_list;
  #if XmVersion >= 2000
      XmRenderTable render_table;
  #endif
!     Cardinal visible_items;
      int state;
      String symbol_name;
      unsigned char label_type;
      XtCallbackList callback;
      Widget *item_widgets;
diff -bpcBNC 5 Xmt310/Xmt/ChooserS.c Xmt310.ge/Xmt/ChooserS.c
*** Xmt310/Xmt/ChooserS.c	Sun Feb  4 22:35:10 2001
--- Xmt310.ge/Xmt/ChooserS.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
diff -bpcBNC 5 Xmt310/Xmt/Cli.c Xmt310.ge/Xmt/Cli.c
*** Xmt310/Xmt/Cli.c	Sun Feb  4 22:35:22 2001
--- Xmt310.ge/Xmt/Cli.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
   
  /*
   * Portions of this file are based upon work done by David Flanagan while
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
   
  /*
   * Portions of this file are based upon work done by David Flanagan while
diff -bpcBNC 5 Xmt310/Xmt/Cli.h Xmt310.ge/Xmt/Cli.h
*** Xmt310/Xmt/Cli.h	Sun Feb  4 22:35:32 2001
--- Xmt310.ge/Xmt/Cli.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtCli_h
  #define _XmtCli_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtCli_h
  #define _XmtCli_h    
diff -bpcBNC 5 Xmt310/Xmt/CliP.h Xmt310.ge/Xmt/CliP.h
*** Xmt310/Xmt/CliP.h	Sun Feb  4 22:35:38 2001
--- Xmt310.ge/Xmt/CliP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtCliP_h
  #define _XmtCliP_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtCliP_h
  #define _XmtCliP_h    
diff -bpcBNC 5 Xmt310/Xmt/CliS.c Xmt310.ge/Xmt/CliS.c
*** Xmt310/Xmt/CliS.c	Sun Feb  4 22:35:42 2001
--- Xmt310.ge/Xmt/CliS.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
diff -bpcBNC 5 Xmt310/Xmt/Color.c Xmt310.ge/Xmt/Color.c
*** Xmt310/Xmt/Color.c	Sun Feb  4 22:35:58 2001
--- Xmt310.ge/Xmt/Color.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
***************
*** 23,32 ****
--- 26,42 ----
  #else
  extern long int strtol();
  #endif
  
  /*
+ ** undefine if you don't want the full colormap fix
+ ** contributed by Glenn Carr 
+ */
+ #define CLOSEST_COLOR
+ 
+ 
+ /*
   * HSL color syntax: H / S / L, where H, S, and L are integers
   * with an optional leading '+' or '-'.  Whitespace is okay.
   */
  #if NeedFunctionPrototypes
  static Boolean ParseHSLColor(StringConst name, XColor *c,
*************** Boolean is_foreground;
*** 91,100 ****
--- 101,238 ----
      c->blue = b;
      c->flags = DoRed | DoGreen | DoBlue;
      return True;
  }
  
+ #ifdef CLOSEST_COLOR
+ 
+ /* Legal Garbage:  I borrowed the basis of this code from the...
+  *
+  * The Tk Toolkit
+  * by John Ousterhout (and many others at Sun Microsystems and elsewhere)
+  * john.ousterhout@eng.sun.com
+  *
+  * This software is copyrighted by the Regents of the University of
+  * California, Sun Microsystems, Inc., and other parties.  The following
+  * terms apply to all files associated with the software unless explicitly
+  * disclaimed in individual files.
+  * 
+  * The authors hereby grant permission to use, copy, modify, distribute,
+  * and license this software and its documentation for any purpose, provided
+  * that existing copyright notices are retained in all copies and that this
+  * notice is included verbatim in any distributions. No written agreement,
+  * license, or royalty fee is required for any of the authorized uses.
+  * Modifications to this software may be copyrighted by their authors
+  * and need not follow the licensing terms described here, provided that
+  * the new terms are clearly indicated on the first page of each file where
+  * they apply.
+  * 
+  * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+  * FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+  * ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+  * DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGE.
+  * 
+  * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+  * FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+  * IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+  * NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+  * MODIFICATIONS.
+  * 
+  * RESTRICTED RIGHTS: Use, duplication or disclosure by the government
+  * is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
+  * of the Rights in Technical Data and Computer Software Clause as DFARS
+  * 252.227-7013 and FAR 52.227-19.
+  */
+ 
+ #if NeedFunctionPrototypes
+ static void
+ FindClosestColor(Screen * screen,
+                  Colormap colormap,
+                  XColor * pxcolorDesired,
+                  XColor * pxcolorActual)
+ #else
+ static void
+ FindClosestColor(screen, colormap, pxcolorDesired, pxcolorActual)
+ Screen * screen;
+ Colormap colormap;
+ XColor * pxcolorDesired;
+ XColor * pxcolorActual;
+ #endif
+ {
+     float           closestDistance, distance, tmp;
+     Display        *dpy = DisplayOfScreen(screen);
+     XtAppContext    appContext = XtDisplayToApplicationContext(dpy);
+     Visual         *pvisual = XDefaultVisualOfScreen(screen);
+     static XColor  *pxcolors;
+     int             i, closest;
+     int             nColors = pvisual->map_entries;
+ 
+     /*
+      * Get all the colors from the colormap.  These should all be
+      * allocated, otherwise we wouldn't be here.
+      */
+     if (NULL == pxcolors) {
+         pxcolors = calloc(nColors, sizeof(*pxcolors));
+         for (i = 0; i < nColors; i++)
+             pxcolors[i].pixel = i;
+     }
+     XQueryColors(dpy, colormap, pxcolors, pvisual->map_entries);
+ 
+     while (nColors > 0) {
+         closestDistance = 1e30;
+         closest = 0;
+         for (i = 0; i < nColors; i++) {
+             /*
+              * Use Euclidean distance in RGB space, weighted by Y (of YIQ)
+              * as the objective function;  this accounts for differences
+              * in the color sensitivity of the eye.
+              */
+             tmp = .30 * (((int) pxcolorDesired->red) - (int) pxcolors[i].red);
+             distance = tmp * tmp;
+             tmp = .61 * (((int) pxcolorDesired->green) - (int) pxcolors[i].green);
+             distance += tmp * tmp;
+             tmp = .11 * (((int) pxcolorDesired->blue) - (int) pxcolors[i].blue);
+             distance += tmp * tmp;
+             if (distance < closestDistance) {
+                 closest = i;
+                 closestDistance = distance;
+             }
+         }
+         if (XAllocColor(dpy, colormap, &pxcolors[closest])) {
+             *pxcolorActual = pxcolors[closest];
+             return;
+         }
+         pxcolors[closest] = pxcolors[nColors - 1];
+         nColors -= 1;
+     }
+ 
+     /*
+      * Should never get here, but just in case...
+      */
+     {
+         char            szColor[64];
+         Cardinal        num_params = 1;
+         String          params[1]; 
+ 
+         params[0] = szColor;
+ 
+         sprintf(szColor, "#%04x%04x%04x",
+                 pxcolorDesired->red,
+                 pxcolorDesired->green,
+                 pxcolorDesired->blue);
+ 
+         XtAppWarningMsg(appContext, "badValue", "cvtStringToPixel",
+                         "FindClosestColor",
+                         "Can't find approximation for color \"%s\"",
+                         params, &num_params);
+     }
+ 
+ }                               /* FindClosestColor */
+ 
+ #endif
  /*
   * This function allocates the named color, using the specified
   * colormap, visual, and color table.  The widget argument is
   * used only to obtain the display, and application resoruces.
   * If the colormap, visual, or color table are unspecified, the
*************** Pixel *pixel_return;
*** 125,134 ****
--- 263,277 ----
      Colormap root_colormap = shell->core.colormap;
      XmtAppResources *appres = XmtGetApplicationResources(shell);
      Boolean is_foreground = (name[0] == '+');
      XColor c1, c2;
  
+ #ifdef CLOSEST_COLOR
+     Screen* screen = XtScreen(w);
+ #endif
+ 
+ 
      /* get default values for unspecified values */
      while(!XtIsWidget(w)) w = XtParent(w);
      if (cmap == None) cmap = w->core.colormap;
      if (visual == NULL) visual = XmtGetVisual(w);
      if (ctable == NULL) ctable = appres->colortable;
*************** Pixel *pixel_return;
*** 163,180 ****
--- 306,333 ----
       * Otherwise, it is a color name, or and Xcms color specification,
       * and is converted with XAllocNamedColor()
       */
      if (name[0] == '#') {
  	if (XParseColor(dpy, cmap, name, &c1) == 0) return 1;
+ #ifdef CLOSEST_COLOR
+         if (XAllocColor(dpy, cmap, &c1) == 0)
+             FindClosestColor(screen, cmap, &c1, &c1);
+ #else
          if (XAllocColor(dpy, cmap, &c1) == 0) return 2;
+ #endif
  	*pixel_return = c1.pixel;
  	return 0;
      }
      else if (name[0] == '%') {
  	if (ParseHSLColor(&name[1], &c1, appres, is_foreground) == False)
  	    return 1;
+ #ifdef CLOSEST_COLOR
+         if (XAllocColor(dpy, cmap, &c1) == 0)
+             FindClosestColor(screen, cmap, &c1, &c1);
+ #else
          if (XAllocColor(dpy, cmap, &c1) == 0) return 2;
+ #endif
  	*pixel_return = c1.pixel;
  	return 0;
      }
      else if (name[0] == '$') {  /* lookup symbolic colors by recursing */
  	String newname;
*************** Pixel *pixel_return;
*** 203,213 ****
--- 356,374 ----
  	if (XAllocNamedColor(dpy, cmap, name, &c1, &c2)) {
  	    *pixel_return = c1.pixel;
  	    return 0;
  	}
  	else {
+ #ifdef CLOSEST_COLOR
+             if (XLookupColor(dpy, cmap, name, &c1, &c2)) {
+                 FindClosestColor(screen, cmap, &c2, &c2);
+                 *pixel_return = c2.pixel;
+                 return 0;
+             }
+ #else
              if (XLookupColor(dpy, cmap, name, &c1, &c2)) return 2;
+ #endif
  	    else return 1;
  	}
      }
  }
  
diff -bpcBNC 5 Xmt310/Xmt/Color.h Xmt310.ge/Xmt/Color.h
*** Xmt310/Xmt/Color.h	Sun Feb  4 22:36:12 2001
--- Xmt310.ge/Xmt/Color.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtColor_h
  #define _XmtColor_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtColor_h
  #define _XmtColor_h
diff -bpcBNC 5 Xmt310/Xmt/ColorTable.c Xmt310.ge/Xmt/ColorTable.c
*** Xmt310/Xmt/ColorTable.c	Sun Feb  4 22:36:20 2001
--- Xmt310.ge/Xmt/ColorTable.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Hash.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Hash.h>
diff -bpcBNC 5 Xmt310/Xmt/ColorTblCvt.c Xmt310.ge/Xmt/ColorTblCvt.c
*** Xmt310/Xmt/ColorTblCvt.c	Sun Feb  4 22:36:24 2001
--- Xmt310.ge/Xmt/ColorTblCvt.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
diff -bpcBNC 5 Xmt310/Xmt/ContextHelp.c Xmt310.ge/Xmt/ContextHelp.c
*** Xmt310/Xmt/ContextHelp.c	Sun Feb  4 22:36:30 2001
--- Xmt310.ge/Xmt/ContextHelp.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Help.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Help.h>
diff -bpcBNC 5 Xmt310/Xmt/ConvertData.c Xmt310.ge/Xmt/ConvertData.c
*** Xmt310/Xmt/ConvertData.c	Sun Feb  4 22:36:34 2001
--- Xmt310.ge/Xmt/ConvertData.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Converters.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Converters.h>
diff -bpcBNC 5 Xmt310/Xmt/Converters.h Xmt310.ge/Xmt/Converters.h
*** Xmt310/Xmt/Converters.h	Sun Feb  4 22:36:42 2001
--- Xmt310.ge/Xmt/Converters.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  #ifndef _XmtConverters_h
  #define _XmtConverters_h
  
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  #ifndef _XmtConverters_h
  #define _XmtConverters_h
  
*************** externalref _Xconst char XmtConverterStr
*** 35,46 ****
  #define XmtRBitmask ((char*)&XmtConverterStrings[50])
  #endif
  
  _XFUNCPROTOBEGIN
  #if NeedFunctionPrototypes
! extern void XmtRegisterEnumConverter(StringConst, String *, int *,
! 				     int, String *);
  extern void XmtRegisterWidgetConverter(void);
  extern void XmtRegisterCallbackConverter(void);
  extern void XmtRegisterXmStringConverter(void);
  extern void XmtRegisterStringListConverter(void);
  extern void XmtRegisterMenuItemsConverter(void);
--- 38,49 ----
  #define XmtRBitmask ((char*)&XmtConverterStrings[50])
  #endif
  
  _XFUNCPROTOBEGIN
  #if NeedFunctionPrototypes
! extern void XmtRegisterEnumConverter(StringConst, String *, Cardinal *,
! 				     Cardinal, String *);
  extern void XmtRegisterWidgetConverter(void);
  extern void XmtRegisterCallbackConverter(void);
  extern void XmtRegisterXmStringConverter(void);
  extern void XmtRegisterStringListConverter(void);
  extern void XmtRegisterMenuItemsConverter(void);
diff -bpcBNC 5 Xmt310/Xmt/ConvertersP.h Xmt310.ge/Xmt/ConvertersP.h
*** Xmt310/Xmt/ConvertersP.h	Sun Feb  4 22:36:46 2001
--- Xmt310.ge/Xmt/ConvertersP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtConvertersP_h
  #define _XmtConvertersP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtConvertersP_h
  #define _XmtConvertersP_h
diff -bpcBNC 5 Xmt310/Xmt/Create.c Xmt310.ge/Xmt/Create.c
*** Xmt310/Xmt/Create.c	Sun Feb  4 22:36:52 2001
--- Xmt310.ge/Xmt/Create.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Create.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Create.h>
*************** Cardinal *num_styles;
*** 318,328 ****
  	    template_name = XmtLexerStrValue(l);
  	    XmtLexerConsumeToken(l);
  	    XmtLexerGetArgList(l, args, MAX_TEMPLATE_ARGS, &num_args);
  	    style = XmtTemplateSubstituteArgs(style, args, num_args,
  					      &expected_args);
! 	    *styles[*num_styles] = style;
  	    *num_styles += 1;
  	    if (num_args > expected_args)
  		XmtWarningMsg("XmtParseWidgetType", "styleArgs",
  			      "widget '%s':\n\tstyle '%s' expects up to %d args; %d passed.",
  			      name, template_name, expected_args, num_args);
--- 321,331 ----
  	    template_name = XmtLexerStrValue(l);
  	    XmtLexerConsumeToken(l);
  	    XmtLexerGetArgList(l, args, MAX_TEMPLATE_ARGS, &num_args);
  	    style = XmtTemplateSubstituteArgs(style, args, num_args,
  					      &expected_args);
! 	    (*styles)[*num_styles] = style;
  	    *num_styles += 1;
  	    if (num_args > expected_args)
  		XmtWarningMsg("XmtParseWidgetType", "styleArgs",
  			      "widget '%s':\n\tstyle '%s' expects up to %d args; %d passed.",
  			      name, template_name, expected_args, num_args);
diff -bpcBNC 5 Xmt310/Xmt/Create.h Xmt310.ge/Xmt/Create.h
*** Xmt310/Xmt/Create.h	Sun Feb  4 22:37:14 2001
--- Xmt310.ge/Xmt/Create.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtCreate_h
  #define _XmtCreate_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtCreate_h
  #define _XmtCreate_h
diff -bpcBNC 5 Xmt310/Xmt/Cursor.c Xmt310.ge/Xmt/Cursor.c
*** Xmt310/Xmt/Cursor.c	Sun Feb  4 22:37:22 2001
--- Xmt310.ge/Xmt/Cursor.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/AppResP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/AppResP.h>
diff -bpcBNC 5 Xmt310/Xmt/DECHack.c Xmt310.ge/Xmt/DECHack.c
*** Xmt310/Xmt/DECHack.c	Sun Feb  4 22:37:34 2001
--- Xmt310.ge/Xmt/DECHack.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * The procedures in this file are only needed with DECWindows Xt
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  /*
   * The procedures in this file are only needed with DECWindows Xt
diff -bpcBNC 5 Xmt310/Xmt/Dialog.c Xmt310.ge/Xmt/Dialog.c
*** Xmt310/Xmt/Dialog.c	Sun Feb  4 22:37:38 2001
--- Xmt310.ge/Xmt/Dialog.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/DialogP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/DialogP.h>
diff -bpcBNC 5 Xmt310/Xmt/Dialog.h Xmt310.ge/Xmt/Dialog.h
*** Xmt310/Xmt/Dialog.h	Sun Feb  4 22:37:54 2001
--- Xmt310.ge/Xmt/Dialog.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtDialog_h
  #define _XmtDialog_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtDialog_h
  #define _XmtDialog_h
diff -bpcBNC 5 Xmt310/Xmt/DialogP.h Xmt310.ge/Xmt/DialogP.h
*** Xmt310/Xmt/DialogP.h	Sun Feb  4 22:38:04 2001
--- Xmt310.ge/Xmt/DialogP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtDialogP_h
  #define _XmtDialogP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtDialogP_h
  #define _XmtDialogP_h
diff -bpcBNC 5 Xmt310/Xmt/DialogPos.c Xmt310.ge/Xmt/DialogPos.c
*** Xmt310/Xmt/DialogPos.c	Sun Feb  4 22:38:18 2001
--- Xmt310.ge/Xmt/DialogPos.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Dialogs.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Dialogs.h>
diff -bpcBNC 5 Xmt310/Xmt/Dialogs.c Xmt310.ge/Xmt/Dialogs.c
*** Xmt310/Xmt/Dialogs.c	Sun Feb  4 22:38:24 2001
--- Xmt310.ge/Xmt/Dialogs.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ScreenP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ScreenP.h>
diff -bpcBNC 5 Xmt310/Xmt/Dialogs.h Xmt310.ge/Xmt/Dialogs.h
*** Xmt310/Xmt/Dialogs.h	Sun Feb  4 22:38:30 2001
--- Xmt310.ge/Xmt/Dialogs.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtDialogs_h
  #define _XmtDialogs_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtDialogs_h
  #define _XmtDialogs_h    
diff -bpcBNC 5 Xmt310/Xmt/DialogsP.h Xmt310.ge/Xmt/DialogsP.h
*** Xmt310/Xmt/DialogsP.h	Sun Feb  4 22:38:40 2001
--- Xmt310.ge/Xmt/DialogsP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtDialogsP_h
  #define _XmtDialogsP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtDialogsP_h
  #define _XmtDialogsP_h
diff -bpcBNC 5 Xmt310/Xmt/Discard.c Xmt310.ge/Xmt/Discard.c
*** Xmt310/Xmt/Discard.c	Sun Feb  4 22:38:48 2001
--- Xmt310.ge/Xmt/Discard.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Util.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Util.h>
diff -bpcBNC 5 Xmt310/Xmt/EnumCvt.c Xmt310.ge/Xmt/EnumCvt.c
*** Xmt310/Xmt/EnumCvt.c	Sun Feb  4 22:38:54 2001
--- Xmt310.ge/Xmt/EnumCvt.c	Tue Jun 12 18:25:28 2001
***************
*** 1,46 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ConvertersP.h>
  
  /* ARGSUSED */
  #if NeedFunctionPrototypes
  Boolean XmtConvertStringToEnum(Display *dpy,
! 			       XrmValue *args, Cardinal *num_args,
! 			       XrmValue *from, XrmValue *to, XtPointer *data)
  #else
  Boolean XmtConvertStringToEnum(dpy, args, num_args, from, to, data)
  Display *dpy;
! XrmValue *args;
  Cardinal *num_args;
! XrmValue *from;
! XrmValue *to;
  XtPointer *data;
  #endif
  {
      String type = *(String *)args[0].addr;
      String *names = *(String **)args[1].addr;
!     int *values = *(int **)args[2].addr;
!     int num = *(int *)args[3].addr;
      String *prefixes = *(String **)args[4].addr;
      String target = (String) from->addr;
      String prefix;
      int i;
!     static int value;  /* static for converter return */
  
      /*
       * First, strip any of the listed prefixes off of target.
       * All of the prefixes are optional, but they must occur in the
       * order that they appear in the array in.
--- 1,51 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ConvertersP.h>
  
  /* ARGSUSED */
  #if NeedFunctionPrototypes
  Boolean XmtConvertStringToEnum(Display *dpy,
!                                XrmValuePtr args, Cardinal *num_args,
!                                XrmValuePtr from, XrmValuePtr to, XtPointer *data)
  #else
  Boolean XmtConvertStringToEnum(dpy, args, num_args, from, to, data)
  Display *dpy;
! XrmValuePtr args;
  Cardinal *num_args;
! XrmValuePtr from;
! XrmValuePtr to;
  XtPointer *data;
  #endif
  {
      String type = *(String *)args[0].addr;
      String *names = *(String **)args[1].addr;
! /*     Cardinal *values = *(Cardinal**)args[2].addr; */
! /*     Cardinal num = (Cardinal)*(XtPointer*)args[3].addr; */
!     Cardinal *values = (Cardinal*)*(XtPointer*)args[2].addr;
!     Cardinal num = (Cardinal)*(XtPointer*)args[3].addr;
      String *prefixes = *(String **)args[4].addr;
      String target = (String) from->addr;
      String prefix;
      int i;
!     static Cardinal value;  /* static for converter return */
  
      /*
       * First, strip any of the listed prefixes off of target.
       * All of the prefixes are optional, but they must occur in the
       * order that they appear in the array in.
*************** XtPointer *data;
*** 57,66 ****
--- 62,74 ----
      /*
       * now see if the target appears in the names array.
       * If not, print a warning and fail.
       */
      i = XmtBSearch(target, names, num);
+ 
+ /* printf("XmtBSearch(target, names, num) => %d\n", i); */
+ 
      if (i == -1) {
          XtDisplayStringConversionWarning(dpy, (String)from->addr, type);
          return False;
      }
      
*************** XtPointer *data;
*** 73,95 ****
      if (to->addr != NULL) {
  	switch (to->size) {
  	case sizeof(char):
  	    *(char *)to->addr = value;
  	    break;
  	case sizeof(short):
  	    *(short *)to->addr = value;
  	    break;
! 	case sizeof(int):
! 	    *(int *)to->addr = value;
  	    break;
  	default:
! 	    if (to->size > sizeof(int)) {
! 		to->size = sizeof(int);
! 		*(int *)to->addr = value;
  	    }
  	    else {
! 		to->size = sizeof(int);
  		return False;
  	    }
  	    break;
  	}
      }
--- 81,109 ----
      if (to->addr != NULL) {
          switch (to->size) {
          case sizeof(char):
              *(char *)to->addr = value;
              break;
+ #ifdef CRAY /* short and int are the same size (8 bytes) on the Cray */
+         case sizeof(int):
+             *(int *)to->addr = value;
+             break;
+ #else
          case sizeof(short):
              *(short *)to->addr = value;
              break;
!         case sizeof(Cardinal):
!             *(Cardinal *)to->addr = value;
              break;
+ #endif
          default:
!             if (to->size > sizeof(Cardinal)) {
!                 to->size = sizeof(Cardinal);
!                 *(Cardinal *)to->addr = value;
              }
              else {
!                 to->size = sizeof(Cardinal);
                  return False;
              }
              break;
          }
      }
*************** XtPointer *data;
*** 100,117 ****
      return True;
  }
  
  
  #if NeedFunctionPrototypes
! void XmtRegisterEnumConverter(StringConst type, String *names, int *values,
! 			      int num, String *prefixes)
  #else
  void XmtRegisterEnumConverter(type, names, values, num, prefixes)
  StringConst type;
  String *names;
! int *values;
! int num;
  String *prefixes;
  #endif
  {
      XtConvertArgRec args[5];
  
--- 114,131 ----
      return True;
  }
  
  
  #if NeedFunctionPrototypes
! void XmtRegisterEnumConverter(StringConst type, String *names, Cardinal *values,
!                               Cardinal num, String *prefixes)
  #else
  void XmtRegisterEnumConverter(type, names, values, num, prefixes)
  StringConst type;
  String *names;
! Cardinal *values;
! Cardinal num;
  String *prefixes;
  #endif
  {
      XtConvertArgRec args[5];
  
diff -bpcBNC 5 Xmt310/Xmt/FindFile.c Xmt310.ge/Xmt/FindFile.c
*** Xmt310/Xmt/FindFile.c	Sun Feb  4 22:39:06 2001
--- Xmt310.ge/Xmt/FindFile.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * Portions of this file are derived from the Xt source code.
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  /*
   * Portions of this file are derived from the Xt source code.
***************
*** 34,43 ****
--- 37,47 ----
  extern struct passwd *getpwuid(), *getpwnam();
  #endif
  
  #ifndef X_NOT_STDC_ENV
  #include <stdlib.h>
+ #include <unistd.h>
  #else
  extern char *getenv();
  #endif
  
  #if NeedFunctionPrototypes
diff -bpcBNC 5 Xmt310/Xmt/FontListCvt.c Xmt310.ge/Xmt/FontListCvt.c
*** Xmt310/Xmt/FontListCvt.c	Sun Feb  4 22:39:10 2001
--- Xmt310.ge/Xmt/FontListCvt.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
*************** XtPointer *converter_data;
*** 38,48 ****
--- 41,59 ----
      String copy = XtNewString((String) from->addr);
      String s;
      String next_entry;
      String tag;
      String tmp;
+ #if 0    
      XFontStruct *font;
+     XFontSet fontset;
+     char **missing_list;
+     int missing_count;
+     int i;
+     char *def_string = NULL; 
+ #endif    
+     XmFontListEntry entry;
      XmFontList fontlist = NULL;
  
      /*
       * This XmFontList converter does not handle XFontSets defined in
       * X11R5 and Motif 1.2.  This is to make it easier to write, and
*************** XtPointer *converter_data;
*** 107,116 ****
--- 118,129 ----
  	while(isspace(*s)) s++;
  	if (!*s) break;
  
  	/* isolate the first entry, and remember start of next entry */
  	next_entry = strchr(s, ',');
+         if (next_entry == NULL)
+             next_entry = strchr(s, ':');
  	if (next_entry) {
  	    *next_entry = '\0';
  	    next_entry++;
  	}
  
*************** XtPointer *converter_data;
*** 138,147 ****
--- 151,192 ----
  	/* remove any whitespace from the end of the font name */
  	tmp = s + strlen(s) - 1;
  	while (isspace(*tmp)) tmp--;
  	*(++tmp) = '\0';
  
+ #if 0
+         /*
+         ** fontset support it is a bit tricky, but needed for multibyte chars
+         ** FIXME: figure out how to do it
+         */
+ 
+         fontset = XCreateFontSet(dpy, s, &missing_list, &missing_count,
+                                         &def_string);
+         for (i=0; i<missing_count; i++) {
+             printf("missing_list[%d]: '%s'\n", i, missing_list[i]);
+             XtFree(missing_list[i]);
+         }
+         XtFree((char *)missing_list);
+ 
+ #if !defined(SOLARIS) && !defined(SOLARIS64)
+         entry = XmFontListEntryLoad(dpy, s, XmFONT_IS_FONT, tag);
+ #else
+         entry = XmFontListEntryLoad(dpy, s, XmFONT_IS_FONTSET, tag);
+ #endif
+ #endif
+         
+         /*
+         ** FIXME: replace the following line with the correct version
+         **        for multibyte chars and fontsets
+         */
+         entry = XmFontListEntryLoad(dpy, s, XmFONT_IS_FONT, tag);
+ 
+         fontlist = XmFontListAppendEntry(fontlist, entry);
+         XmFontListEntryFree(&entry);
+         
+ 
+ #if 0
  	font = XLoadQueryFont(dpy, s);
  	if (!font) {
  	    XmtWarningMsg("XmtConvertStringToFontList", "badfont",
  			  "unknown font '%s'.\n\tUsing default.",
  			  s);
*************** XtPointer *converter_data;
*** 159,168 ****
--- 204,215 ----
  	/* and use this font and tag to create or append to the font list */
  	if (!fontlist)
  	    fontlist = XmFontListCreate(font, tag);
  	else 
  	    fontlist = XmFontListAdd(fontlist, font, tag);
+ 
+ #endif
  
  	/* finally, move on to the next entry, and start the loop over */
  	s = next_entry;
      }
  
diff -bpcBNC 5 Xmt310/Xmt/GetPixmap.c Xmt310.ge/Xmt/GetPixmap.c
*** Xmt310/Xmt/GetPixmap.c	Sun Feb  4 22:39:16 2001
--- Xmt310.ge/Xmt/GetPixmap.c	Tue Jun 12 18:25:28 2001
***************
*** 1,21 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <ctype.h>
  #include <Xmt/Xmt.h>
  #include <Xmt/Pixmap.h>
  #include <Xmt/Xpm.h>
  #include <Xmt/Xbm.h>
  #include <Xmt/Color.h>
--- 1,27 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <ctype.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ 
  #include <Xmt/Xmt.h>
  #include <Xmt/Pixmap.h>
  #include <Xmt/Xpm.h>
  #include <Xmt/Xbm.h>
  #include <Xmt/Color.h>
*************** Boolean get_bitmap;
*** 56,66 ****
      Boolean bitmap_file = False;
      XtCacheRef color_table_cache_ref;
      XtCacheRef refs[2];
      Boolean free_color_table = False;
      static int unique_image_number;
-     extern char *getenv();
  
      for(w=object; !XtIsWidget(w); w = XtParent(w));
      shell = XmtGetShell(w);
  
      app = XmtGetApplicationResources(shell);
--- 62,71 ----
diff -bpcBNC 5 Xmt310/Xmt/HSLtoRGB.c Xmt310.ge/Xmt/HSLtoRGB.c
*** Xmt310/Xmt/HSLtoRGB.c	Sun Feb  4 22:39:20 2001
--- Xmt310.ge/Xmt/HSLtoRGB.c	Tue Jun 12 18:25:28 2001
***************
*** 1,18 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * RGB <--> HSL conversions were modified from code with the
   * following attributions;
   *
--- 1,23 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
+ 
+ #include <Xmt/Xmt.h>
  
  /*
   * RGB <--> HSL conversions were modified from code with the
   * following attributions;
   *
diff -bpcBNC 5 Xmt310/Xmt/Hash.c Xmt310.ge/Xmt/Hash.c
*** Xmt310/Xmt/Hash.c	Sun Feb  4 22:39:26 2001
--- Xmt310.ge/Xmt/Hash.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * This file is derived from the X11R5 source code.
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  /*
   * This file is derived from the X11R5 source code.
*************** typedef struct _Bucket {	/* Stores one e
*** 26,56 ****
      struct _Bucket *next;
  } Bucket;
  
  typedef struct _XmtHashTableRec {
      Bucket **table;		/* Pointer to array of hash entries. */
!     int size;                   /* log2 of the size */
!     int mask;			/* Current size of hash table minus 1. */
!     int numentries;		/* Number of entries currently in table. */
  } XmtHashTableRec;
  
  
  #define Hash(ht,key) \
!     (ht)->table[(((int)(key)) >> 2) & (ht)->mask]
  
  #if NeedFunctionPrototypes
  static void ResizeTable(register XmtHashTable ht, Boolean grow)    
  #else
  static void ResizeTable(ht, grow)
  register XmtHashTable ht;
  Boolean grow;    
  #endif
  {
      Bucket **otable;
!     int otablesize;
      register Bucket *bucket, *next, **head;
!     register int i;
  
      otable = ht->table;
      otablesize =  1 << ht->size;
  
      if (grow) ht->size++;
--- 29,59 ----
      struct _Bucket *next;
  } Bucket;
  
  typedef struct _XmtHashTableRec {
      Bucket **table;		/* Pointer to array of hash entries. */
!     long size;                   /* log2 of the size */
!     long mask;			/* Current size of hash table minus 1. */
!     long numentries;		/* Number of entries currently in table. */
  } XmtHashTableRec;
  
  
  #define Hash(ht,key) \
!     (ht)->table[(((long)(key)) >> 2) & (ht)->mask]
  
  #if NeedFunctionPrototypes
  static void ResizeTable(register XmtHashTable ht, Boolean grow)    
  #else
  static void ResizeTable(ht, grow)
  register XmtHashTable ht;
  Boolean grow;    
  #endif
  {
      Bucket **otable;
!     long otablesize;
      register Bucket *bucket, *next, **head;
!     register long i;
  
      otable = ht->table;
      otablesize =  1 << ht->size;
  
      if (grow) ht->size++;
*************** void XmtHashTableDestroy(XmtHashTable ht
*** 92,102 ****
  #else
  void XmtHashTableDestroy(ht)
  XmtHashTable ht;
  #endif
  {
!     register int i;
      register Bucket *bucket, *next;
  
      for(i=0; i < ht->mask+1; i++) {
  	for (bucket = ht->table[i]; bucket; bucket = next) {
  	    next = bucket->next;
--- 95,105 ----
  #else
  void XmtHashTableDestroy(ht)
  XmtHashTable ht;
  #endif
  {
!     register long i;
      register Bucket *bucket, *next;
  
      for(i=0; i < ht->mask+1; i++) {
  	for (bucket = ht->table[i]; bucket; bucket = next) {
  	    next = bucket->next;
*************** void XmtHashTableForEach(XmtHashTable ta
*** 113,123 ****
  void XmtHashTableForEach(table, proc)
  XmtHashTable table;
  XmtHashTableForEachProc proc;
  #endif
  {
!     register int i;
      register Bucket *bucket;
  
      for(i=0; i < table->mask+1; i++) {
  	for (bucket = table->table[i]; bucket; bucket = bucket->next)
  	    (*proc)(table, bucket->key, &bucket->data);
--- 116,126 ----
  void XmtHashTableForEach(table, proc)
  XmtHashTable table;
  XmtHashTableForEachProc proc;
  #endif
  {
!     register long i;
      register Bucket *bucket;
  
      for(i=0; i < table->mask+1; i++) {
  	for (bucket = table->table[i]; bucket; bucket = bucket->next)
  	    (*proc)(table, bucket->key, &bucket->data);
diff -bpcBNC 5 Xmt310/Xmt/Hash.h Xmt310.ge/Xmt/Hash.h
*** Xmt310/Xmt/Hash.h	Sun Feb  4 22:39:30 2001
--- Xmt310.ge/Xmt/Hash.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtHash_h
  #define _XmtHash_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtHash_h
  #define _XmtHash_h
diff -bpcBNC 5 Xmt310/Xmt/Help.h Xmt310.ge/Xmt/Help.h
*** Xmt310/Xmt/Help.h	Sun Feb  4 22:39:38 2001
--- Xmt310.ge/Xmt/Help.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtHelp_h
  #define _XmtHelp_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtHelp_h
  #define _XmtHelp_h
diff -bpcBNC 5 Xmt310/Xmt/HelpBox.c Xmt310.ge/Xmt/HelpBox.c
*** Xmt310/Xmt/HelpBox.c	Sun Feb  4 22:39:42 2001
--- Xmt310.ge/Xmt/HelpBox.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/XmtP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/XmtP.h>
diff -bpcBNC 5 Xmt310/Xmt/HelpBox.h Xmt310.ge/Xmt/HelpBox.h
*** Xmt310/Xmt/HelpBox.h	Sun Feb  4 22:39:46 2001
--- Xmt310.ge/Xmt/HelpBox.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtHelpBox_h
  #define _XmtHelpBox_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtHelpBox_h
  #define _XmtHelpBox_h    
diff -bpcBNC 5 Xmt310/Xmt/HelpBoxP.h Xmt310.ge/Xmt/HelpBoxP.h
*** Xmt310/Xmt/HelpBoxP.h	Sun Feb  4 22:39:50 2001
--- Xmt310.ge/Xmt/HelpBoxP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtHelpBoxP_h
  #define _XmtHelpBoxP_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtHelpBoxP_h
  #define _XmtHelpBoxP_h    
diff -bpcBNC 5 Xmt310/Xmt/HelpBoxS.c Xmt310.ge/Xmt/HelpBoxS.c
*** Xmt310/Xmt/HelpBoxS.c	Sun Feb  4 22:39:56 2001
--- Xmt310.ge/Xmt/HelpBoxS.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
diff -bpcBNC 5 Xmt310/Xmt/HelpBrowser.c Xmt310.ge/Xmt/HelpBrowser.c
*** Xmt310/Xmt/HelpBrowser.c	Sun Feb  4 22:40:00 2001
--- Xmt310.ge/Xmt/HelpBrowser.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/XmtP.h>
  #include <Xmt/HelpBrowserP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/XmtP.h>
  #include <Xmt/HelpBrowserP.h>
*************** Widget w;
*** 420,430 ****
      ac = 0;
      XtSetArg(args[ac], XmNfontList, hb->help_browser.toc_font_list); ac++;
      XtSetArg(args[ac], XmNvisibleItemCount, hb->help_browser.toc_rows); ac++;
      XtSetArg(args[ac], XmtNlayoutIn, mainrow); ac++;
      hb->help_browser.toc_w = XmCreateScrolledList(w, "toc", args, ac);
!     label = XmtCreateXmString(hb->help_browser.toc_label);
      XtVaSetValues(XtParent(hb->help_browser.toc_w),
  		  XmtNlayoutCaption, label,
  		  XmtNlayoutCaptionPosition, XmtLayoutTop,
  		  XmtNlayoutCaptionJustification, XmtLayoutFlushLeft,
  		  NULL);
--- 423,433 ----
      ac = 0;
      XtSetArg(args[ac], XmNfontList, hb->help_browser.toc_font_list); ac++;
      XtSetArg(args[ac], XmNvisibleItemCount, hb->help_browser.toc_rows); ac++;
      XtSetArg(args[ac], XmtNlayoutIn, mainrow); ac++;
      hb->help_browser.toc_w = XmCreateScrolledList(w, "toc", args, ac);
!     label = XmtCreateLocalizedXmString(w, hb->help_browser.toc_label);
      XtVaSetValues(XtParent(hb->help_browser.toc_w),
  		  XmtNlayoutCaption, label,
  		  XmtNlayoutCaptionPosition, XmtLayoutTop,
  		  XmtNlayoutCaptionJustification, XmtLayoutFlushLeft,
  		  NULL);
*************** Widget w;
*** 433,443 ****
  
      ac = 0;
      XtSetArg(args[ac], XmNfontList, hb->help_browser.index_font_list); ac++;
      XtSetArg(args[ac], XmtNlayoutIn, mainrow); ac++;
      hb->help_browser.index_w = XmCreateScrolledList(w, "index", args, ac);
!     label = XmtCreateXmString(hb->help_browser.index_label);
      XtVaSetValues(XtParent(hb->help_browser.index_w),
  		  XmtNlayoutCaption, label,
  		  XmtNlayoutCaptionPosition, XmtLayoutTop,
  		  XmtNlayoutCaptionJustification, XmtLayoutFlushLeft,
  		  XmtNlayoutStretchability, 0,
--- 436,446 ----
  
      ac = 0;
      XtSetArg(args[ac], XmNfontList, hb->help_browser.index_font_list); ac++;
      XtSetArg(args[ac], XmtNlayoutIn, mainrow); ac++;
      hb->help_browser.index_w = XmCreateScrolledList(w, "index", args, ac);
!     label = XmtCreateLocalizedXmString(w, hb->help_browser.index_label);
      XtVaSetValues(XtParent(hb->help_browser.index_w),
  		  XmtNlayoutCaption, label,
  		  XmtNlayoutCaptionPosition, XmtLayoutTop,
  		  XmtNlayoutCaptionJustification, XmtLayoutFlushLeft,
  		  XmtNlayoutStretchability, 0,
*************** Widget w;
*** 463,473 ****
  		      UpCallback, (XtPointer)hb);
  		      
      }
      XtCreateManagedWidget("", xmSeparatorWidgetClass,
  			  hb->help_browser.text_title_pane, NULL, 0);
!     label = XmtCreateXmString(hb->help_browser.crossref_label);
      hb->help_browser.see_also_label = 
  	XtVaCreateManagedWidget("", xmLabelWidgetClass,
  				hb->help_browser.text_title_pane,
  				XmNlabelString, label,
  				XmNfontList,hb->help_browser.section_font_list,
--- 466,476 ----
  		      UpCallback, (XtPointer)hb);
  		      
      }
      XtCreateManagedWidget("", xmSeparatorWidgetClass,
  			  hb->help_browser.text_title_pane, NULL, 0);
!     label = XmtCreateLocalizedXmString(w, hb->help_browser.crossref_label);
      hb->help_browser.see_also_label = 
  	XtVaCreateManagedWidget("", xmLabelWidgetClass,
  				hb->help_browser.text_title_pane,
  				XmNlabelString, label,
  				XmNfontList,hb->help_browser.section_font_list,
*************** Widget w;
*** 566,588 ****
      ac = 0;
      XtSetArg(args[ac], XmNlabelString, NULL); ac++;
      XtSetArg(args[ac], XmtNlayoutIn, buttonbox); ac++;	
      
      args[0].value =
! 	(XtArgVal)XmtCreateXmString(hb->help_browser.next_label);
      hb->help_browser.next_w =
  	XtCreateManagedWidget("next", xmPushButtonWidgetClass, w, args, ac);
      XmStringFree((XmString)args[0].value);
  
      args[0].value =
! 	(XtArgVal)XmtCreateXmString(hb->help_browser.prev_label);
      hb->help_browser.prev_w =
  	XtCreateManagedWidget("prev", xmPushButtonWidgetClass, w, args, ac);
      XmStringFree((XmString)args[0].value);
  
      args[0].value =
! 	(XtArgVal)XmtCreateXmString(hb->help_browser.done_label);
      hb->help_browser.done_w =
  	XtCreateWidget("done", xmPushButtonWidgetClass, w, args, ac);
      /* give this button a large margin to set it off from the others */
      XtVaSetValues(hb->help_browser.done_w, XmtNlayoutMarginWidth, 15, NULL);
      XtManageChild(hb->help_browser.done_w);
--- 569,591 ----
      ac = 0;
      XtSetArg(args[ac], XmNlabelString, NULL); ac++;
      XtSetArg(args[ac], XmtNlayoutIn, buttonbox); ac++;	
      
      args[0].value =
! 	(XtArgVal)XmtCreateLocalizedXmString(w, hb->help_browser.next_label);
      hb->help_browser.next_w =
  	XtCreateManagedWidget("next", xmPushButtonWidgetClass, w, args, ac);
      XmStringFree((XmString)args[0].value);
  
      args[0].value =
! 	(XtArgVal)XmtCreateLocalizedXmString(w, hb->help_browser.prev_label);
      hb->help_browser.prev_w =
  	XtCreateManagedWidget("prev", xmPushButtonWidgetClass, w, args, ac);
      XmStringFree((XmString)args[0].value);
  
      args[0].value =
! 	(XtArgVal)XmtCreateLocalizedXmString(w, hb->help_browser.done_label);
      hb->help_browser.done_w =
  	XtCreateWidget("done", xmPushButtonWidgetClass, w, args, ac);
      /* give this button a large margin to set it off from the others */
      XtVaSetValues(hb->help_browser.done_w, XmtNlayoutMarginWidth, 15, NULL);
      XtManageChild(hb->help_browser.done_w);
*************** Cardinal *num_args;
*** 1316,1338 ****
  	XtVaSetValues(sw->help_browser.index_title_g, XmtNlabel,
  		      sw->help_browser.index_label, NULL);
  	sw->help_browser.index_label = empty_string;
      }
      if (Changed(next_label)) {
! 	label = XmtCreateXmString(sw->help_browser.next_label);
  	XtVaSetValues(sw->help_browser.next_w, XmNlabelString, label, NULL);
  	XmStringFree(label);
  	sw->help_browser.next_label = empty_string;
      }
      if (Changed(prev_label)) {
! 	label = XmtCreateXmString(sw->help_browser.prev_label);
  	XtVaSetValues(sw->help_browser.prev_w, XmNlabelString, label, NULL);
  	XmStringFree(label);
  	sw->help_browser.prev_label = empty_string;
      }
      if (Changed(done_label)) {
! 	label = XmtCreateXmString(sw->help_browser.done_label);
  	XtVaSetValues(sw->help_browser.done_w, XmNlabelString, label, NULL);
  	XmStringFree(label);
  	sw->help_browser.done_label = empty_string;
      }
  
--- 1319,1341 ----
  	XtVaSetValues(sw->help_browser.index_title_g, XmtNlabel,
  		      sw->help_browser.index_label, NULL);
  	sw->help_browser.index_label = empty_string;
      }
      if (Changed(next_label)) {
! 	label = XmtCreateLocalizedXmString((Widget)sw, sw->help_browser.next_label);
  	XtVaSetValues(sw->help_browser.next_w, XmNlabelString, label, NULL);
  	XmStringFree(label);
  	sw->help_browser.next_label = empty_string;
      }
      if (Changed(prev_label)) {
! 	label = XmtCreateLocalizedXmString((Widget) sw, sw->help_browser.prev_label);
  	XtVaSetValues(sw->help_browser.prev_w, XmNlabelString, label, NULL);
  	XmStringFree(label);
  	sw->help_browser.prev_label = empty_string;
      }
      if (Changed(done_label)) {
! 	label = XmtCreateLocalizedXmString((Widget) sw, sw->help_browser.done_label);
  	XtVaSetValues(sw->help_browser.done_w, XmNlabelString, label, NULL);
  	XmStringFree(label);
  	sw->help_browser.done_label = empty_string;
      }
  
diff -bpcBNC 5 Xmt310/Xmt/HelpBrowser.h Xmt310.ge/Xmt/HelpBrowser.h
*** Xmt310/Xmt/HelpBrowser.h	Sun Feb  4 22:40:04 2001
--- Xmt310.ge/Xmt/HelpBrowser.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtHelpBrowser_h
  #define _XmtHelpBrowser_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtHelpBrowser_h
  #define _XmtHelpBrowser_h
diff -bpcBNC 5 Xmt310/Xmt/HelpBrowserP.h Xmt310.ge/Xmt/HelpBrowserP.h
*** Xmt310/Xmt/HelpBrowserP.h	Sun Feb  4 22:40:08 2001
--- Xmt310.ge/Xmt/HelpBrowserP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtHelpBrowserP_h
  #define _XmtHelpBrowserP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtHelpBrowserP_h
  #define _XmtHelpBrowserP_h
diff -bpcBNC 5 Xmt310/Xmt/HelpBrowserS.c Xmt310.ge/Xmt/HelpBrowserS.c
*** Xmt310/Xmt/HelpBrowserS.c	Sun Feb  4 22:40:12 2001
--- Xmt310.ge/Xmt/HelpBrowserS.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
diff -bpcBNC 5 Xmt310/Xmt/HelpNode.c Xmt310.ge/Xmt/HelpNode.c
*** Xmt310/Xmt/HelpNode.c	Sun Feb  4 22:40:16 2001
--- Xmt310.ge/Xmt/HelpNode.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <ctype.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <ctype.h>
diff -bpcBNC 5 Xmt310/Xmt/IBMManage.c Xmt310.ge/Xmt/IBMManage.c
*** Xmt310/Xmt/IBMManage.c	Sun Feb  4 22:40:46 2001
--- Xmt310.ge/Xmt/IBMManage.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * This file is almost directly from the X11R5 distribution.
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  /*
   * This file is almost directly from the X11R5 distribution.
diff -bpcBNC 5 Xmt310/Xmt/Icon.c Xmt310.ge/Xmt/Icon.c
*** Xmt310/Xmt/Icon.c	Sun Feb  4 22:40:52 2001
--- Xmt310.ge/Xmt/Icon.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Icon.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Icon.h>
diff -bpcBNC 5 Xmt310/Xmt/Icon.h Xmt310.ge/Xmt/Icon.h
*** Xmt310/Xmt/Icon.h	Sun Feb  4 22:40:56 2001
--- Xmt310.ge/Xmt/Icon.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtIcon_h
  #define _XmtIcon_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtIcon_h
  #define _XmtIcon_h
diff -bpcBNC 5 Xmt310/Xmt/Icons.c Xmt310.ge/Xmt/Icons.c
*** Xmt310/Xmt/Icons.c	Sun Feb  4 22:41:00 2001
--- Xmt310.ge/Xmt/Icons.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Xpm.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Xpm.h>
diff -bpcBNC 5 Xmt310/Xmt/Include.c Xmt310.ge/Xmt/Include.c
*** Xmt310/Xmt/Include.c	Sun Feb  4 22:41:56 2001
--- Xmt310.ge/Xmt/Include.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <errno.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <errno.h>
*************** Boolean user;
*** 57,77 ****
  Boolean override;
  #endif
  {
      static XrmName required_names[2];
      static XrmClass required_classes[2];
!     static required_quarks_inited = False;
      XmtAppResources *app = XmtGetApplicationResources(w);
      XrmRepresentation type;
      XrmValue value;
      XrmDatabase newdb = NULL;
      XrmDatabase userdb = NULL;
      String full_filename;
      String user_filename;
      Boolean found = False;
      XrmQuark fileq;
!     XtPointer dummy;
  
      if (!filename || filename[0] == '\0') return False;
      
      /* find our application shell */
      w = XmtGetApplicationShell(w);
--- 60,80 ----
  Boolean override;
  #endif
  {
      static XrmName required_names[2];
      static XrmClass required_classes[2];
!     static Boolean required_quarks_inited = False;
      XmtAppResources *app = XmtGetApplicationResources(w);
      XrmRepresentation type;
      XrmValue value;
      XrmDatabase newdb = NULL;
      XrmDatabase userdb = NULL;
      String full_filename;
      String user_filename;
      Boolean found = False;
      XrmQuark fileq;
!     XtPointer dummy = NULL;
  
      if (!filename || filename[0] == '\0') return False;
      
      /* find our application shell */
      w = XmtGetApplicationShell(w);
diff -bpcBNC 5 Xmt310/Xmt/Include.h Xmt310.ge/Xmt/Include.h
*** Xmt310/Xmt/Include.h	Sun Feb  4 22:42:16 2001
--- Xmt310.ge/Xmt/Include.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtInclude_h
  #define _XmtInclude_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtInclude_h
  #define _XmtInclude_h
diff -bpcBNC 5 Xmt310/Xmt/InitFocus.c Xmt310.ge/Xmt/InitFocus.c
*** Xmt310/Xmt/InitFocus.c	Sun Feb  4 22:42:22 2001
--- Xmt310.ge/Xmt/InitFocus.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Util.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Util.h>
diff -bpcBNC 5 Xmt310/Xmt/Initialize.c Xmt310.ge/Xmt/Initialize.c
*** Xmt310/Xmt/Initialize.c	Sun Feb  4 22:42:28 2001
--- Xmt310.ge/Xmt/Initialize.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  
  /*
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  
  /*
diff -bpcBNC 5 Xmt310/Xmt/InputField.c Xmt310.ge/Xmt/InputField.c
*** Xmt310/Xmt/InputField.c	Sun Feb  4 22:42:38 2001
--- Xmt310.ge/Xmt/InputField.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <ctype.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <ctype.h>
diff -bpcBNC 5 Xmt310/Xmt/InputField.h Xmt310.ge/Xmt/InputField.h
*** Xmt310/Xmt/InputField.h	Sun Feb  4 22:42:42 2001
--- Xmt310.ge/Xmt/InputField.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtInputField_h
  #define _XmtInputField_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtInputField_h
  #define _XmtInputField_h
diff -bpcBNC 5 Xmt310/Xmt/InputFieldP.h Xmt310.ge/Xmt/InputFieldP.h
*** Xmt310/Xmt/InputFieldP.h	Sun Feb  4 22:42:48 2001
--- Xmt310.ge/Xmt/InputFieldP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtInputFieldP_h
  #define _XmtInputFieldP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtInputFieldP_h
  #define _XmtInputFieldP_h
diff -bpcBNC 5 Xmt310/Xmt/InputFieldS.c Xmt310.ge/Xmt/InputFieldS.c
*** Xmt310/Xmt/InputFieldS.c	Sun Feb  4 22:42:52 2001
--- Xmt310.ge/Xmt/InputFieldS.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
diff -bpcBNC 5 Xmt310/Xmt/Layout.c Xmt310.ge/Xmt/Layout.c
*** Xmt310/Xmt/Layout.c	Sun Feb  4 22:42:54 2001
--- Xmt310.ge/Xmt/Layout.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/XmtP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/XmtP.h>
*************** static void ClassInitialize(void)
*** 257,308 ****
  static void ClassInitialize()
  #endif
  {
      static String justification_names[] = {
  	"Bottom", "Center", "Centered", "Filled", "Left", "Right", "Top"};
!     static int justification_values[] = {
  	XmtLayoutFlushBottom, XmtLayoutCentered, XmtLayoutCentered,
  	XmtLayoutFilled,XmtLayoutFlushLeft,
  	XmtLayoutFlushRight, XmtLayoutFlushTop};
      static String justification_prefixes[] = {"Xmt", "Layout", "Flush", NULL};
      
      static String edge_names[] = {
  	"Bottom", "Left", "Right", "Top"};
!     static int edge_values[] = {
          XmtLayoutBottom, XmtLayoutLeft, XmtLayoutRight, XmtLayoutTop
      };
      static String edge_prefixes[] = {"Xmt", "Layout", NULL};
  
      static String line_type_names[] = {
          "Double", "DoubleLine", "Etched", "EtchedIn", "EtchedOut",
          "Shadow", "ShadowIn", "ShadowOut", "Single", "SingleLine",
      };
!     static int line_type_values[] = {
          XmtLayoutFrameDoubleLine, XmtLayoutFrameDoubleLine,
          XmtLayoutFrameEtchedIn, XmtLayoutFrameEtchedIn,
          XmtLayoutFrameEtchedOut, XmtLayoutFrameShadowIn,
          XmtLayoutFrameShadowIn, XmtLayoutFrameShadowOut,
          XmtLayoutFrameSingleLine, XmtLayoutFrameSingleLine
      };
  
      static String frame_type_names[] = {
          "Bottom", "Box", "Left", "None", "Right", "Top" };
!     static int frame_type_values[] = {
          XmtLayoutFrameBottom, XmtLayoutFrameBox, XmtLayoutFrameLeft,
          XmtLayoutFrameNone, XmtLayoutFrameRight, XmtLayoutFrameTop
      };
      static String frame_type_prefixes[]  = {"Xmt", "Layout", "Frame", NULL};
  
      static String position_names[] = { "Inside", "Outside", "Through" };
!     static int position_values[] = {
          XmtLayoutFrameInside, XmtLayoutFrameOutside, XmtLayoutFrameThrough };
  
      static String space_type_names[] = {
          "CTabbed", "Even", "Interval", "LCR",
  	"LREven", "LTabbed", "None", "RTabbed"
      };
!     static int space_type_values[] = {
          XmtLayoutSpaceCTabbed, XmtLayoutSpaceEven,
  	XmtLayoutSpaceInterval, XmtLayoutSpaceLCR,
          XmtLayoutSpaceLREven, XmtLayoutSpaceLTabbed,
  	XmtLayoutSpaceNone, XmtLayoutSpaceRTabbed
      };
--- 260,311 ----
  static void ClassInitialize()
  #endif
  {
      static String justification_names[] = {
  	"Bottom", "Center", "Centered", "Filled", "Left", "Right", "Top"};
!     static Cardinal justification_values[] = {
  	XmtLayoutFlushBottom, XmtLayoutCentered, XmtLayoutCentered,
  	XmtLayoutFilled,XmtLayoutFlushLeft,
  	XmtLayoutFlushRight, XmtLayoutFlushTop};
      static String justification_prefixes[] = {"Xmt", "Layout", "Flush", NULL};
      
      static String edge_names[] = {
  	"Bottom", "Left", "Right", "Top"};
!     static Cardinal edge_values[] = {
          XmtLayoutBottom, XmtLayoutLeft, XmtLayoutRight, XmtLayoutTop
      };
      static String edge_prefixes[] = {"Xmt", "Layout", NULL};
  
      static String line_type_names[] = {
          "Double", "DoubleLine", "Etched", "EtchedIn", "EtchedOut",
          "Shadow", "ShadowIn", "ShadowOut", "Single", "SingleLine",
      };
!     static Cardinal line_type_values[] = {
          XmtLayoutFrameDoubleLine, XmtLayoutFrameDoubleLine,
          XmtLayoutFrameEtchedIn, XmtLayoutFrameEtchedIn,
          XmtLayoutFrameEtchedOut, XmtLayoutFrameShadowIn,
          XmtLayoutFrameShadowIn, XmtLayoutFrameShadowOut,
          XmtLayoutFrameSingleLine, XmtLayoutFrameSingleLine
      };
  
      static String frame_type_names[] = {
          "Bottom", "Box", "Left", "None", "Right", "Top" };
!     static Cardinal frame_type_values[] = {
          XmtLayoutFrameBottom, XmtLayoutFrameBox, XmtLayoutFrameLeft,
          XmtLayoutFrameNone, XmtLayoutFrameRight, XmtLayoutFrameTop
      };
      static String frame_type_prefixes[]  = {"Xmt", "Layout", "Frame", NULL};
  
      static String position_names[] = { "Inside", "Outside", "Through" };
!     static Cardinal position_values[] = {
          XmtLayoutFrameInside, XmtLayoutFrameOutside, XmtLayoutFrameThrough };
  
      static String space_type_names[] = {
          "CTabbed", "Even", "Interval", "LCR",
  	"LREven", "LTabbed", "None", "RTabbed"
      };
!     static Cardinal space_type_values[] = {
          XmtLayoutSpaceCTabbed, XmtLayoutSpaceEven,
  	XmtLayoutSpaceInterval, XmtLayoutSpaceLCR,
          XmtLayoutSpaceLREven, XmtLayoutSpaceLTabbed,
  	XmtLayoutSpaceNone, XmtLayoutSpaceRTabbed
      };
*************** Widget c;
*** 1043,1061 ****
  Region region;
  #endif
  {
      XmtLayoutConstraintsPart *cc;
      int x, y, w, h;      /* coordinates of widget */
!     int fx, fy, fw, fh;  /* coordinates of outside of frame */
!     int cx, cy, cw, ch;  /* coordinates of caption bounding box*/
      XmtLayoutFrameType frame_type;
      XmtLayoutFrameLineType frame_line_type;
      int frame_thickness;
      int frame_margin;
      XmtLayoutFramePosition frame_position;
      int frame_total;
!     int caption_total_width, caption_total_height;
      Boolean frame_redrawn;
  
      /*
       * For the specified child widget:
       * compute the position of the frame and caption.  If the frame intersects
--- 1046,1064 ----
  Region region;
  #endif
  {
      XmtLayoutConstraintsPart *cc;
      int x, y, w, h;      /* coordinates of widget */
!     int fx = 0, fy = 0, fw = 0, fh = 0;  /* coordinates of outside of frame */
!     int cx = 0, cy = 0, cw = 0, ch = 0;  /* coordinates of caption bounding box*/
      XmtLayoutFrameType frame_type;
      XmtLayoutFrameLineType frame_line_type;
      int frame_thickness;
      int frame_margin;
      XmtLayoutFramePosition frame_position;
      int frame_total;
!     int caption_total_width = 0, caption_total_height = 0;
      Boolean frame_redrawn;
  
      /*
       * For the specified child widget:
       * compute the position of the frame and caption.  If the frame intersects
*************** Widget w;
*** 1381,1392 ****
  XtWidgetGeometry *request;
  XtWidgetGeometry *reply;
  #endif
  {
      XmtLayoutWidget lw = (XmtLayoutWidget)XtParent(w);
!     Position x,y;
!     Dimension width, height, border_width;
  
      /* this is case 2 described above */
      if (lw->layout.geometry_okay) {
  	XtConfigureWidget(w,
  	      (request->request_mode&CWX)?request->x:w->core.x,
--- 1384,1394 ----
  XtWidgetGeometry *request;
  XtWidgetGeometry *reply;
  #endif
  {
      XmtLayoutWidget lw = (XmtLayoutWidget)XtParent(w);
!     Dimension width, height;
  
      /* this is case 2 described above */
      if (lw->layout.geometry_okay) {
  	XtConfigureWidget(w,
  	      (request->request_mode&CWX)?request->x:w->core.x,
*************** XtWidgetGeometry *reply;
*** 1455,1469 ****
      reply->width = LayoutConstraints(w->layout.toplevel).pref_w +
  	              2 * w->bulletin_board.margin_width;
      reply->height = LayoutConstraints(w->layout.toplevel).pref_h +
  	              2 * w->bulletin_board.margin_height;
      reply->request_mode = CWWidth | CWHeight;
!     if (request->request_mode & (CWWidth | CWHeight) == (CWWidth | CWHeight)
! 	&& request->width == reply->width
! 	&& request->height == reply->height)
  	return XtGeometryYes;
!     else if (reply->width == w->core.width && reply->height == w->core.height)
  	return XtGeometryNo;
      else
  	return XtGeometryAlmost;
  }
  
--- 1457,1471 ----
      reply->width = LayoutConstraints(w->layout.toplevel).pref_w +
  	              2 * w->bulletin_board.margin_width;
      reply->height = LayoutConstraints(w->layout.toplevel).pref_h +
  	              2 * w->bulletin_board.margin_height;
      reply->request_mode = CWWidth | CWHeight;
!     if (((request->request_mode & (CWWidth | CWHeight)) == (CWWidth | CWHeight))
! 	&& (request->width == reply->width)
! 	&& (request->height == reply->height))
  	return XtGeometryYes;
!     else if ((reply->width == w->core.width) && (reply->height == w->core.height))
  	return XtGeometryNo;
      else
  	return XtGeometryAlmost;
  }
  
*************** Cardinal *num_args;
*** 2027,2037 ****
       */
      if ((set->core.x != current->core.x) || (set->core.y != current->core.y)) {
  	set->core.x = current->core.x;
  	set->core.y = current->core.y;
  	XmtWarningMsg("XmtLayout", "cantsetpos",
! 		      "Widget %s: can't set XtNx or XtNy resources of a child of\n\tan XmtLayout widget.  Changes ignored.");
      }
  
  #undef Changed
  
      /*
--- 2029,2039 ----
       */
      if ((set->core.x != current->core.x) || (set->core.y != current->core.y)) {
  	set->core.x = current->core.x;
  	set->core.y = current->core.y;
  	XmtWarningMsg("XmtLayout", "cantsetpos",
! 		      "Widget %s: can't set XtNx or XtNy resources of a child of\n\tan XmtLayout widget.  Changes ignored.", XtName((Widget)set));
      }
  
  #undef Changed
  
      /*
diff -bpcBNC 5 Xmt310/Xmt/Layout.h Xmt310.ge/Xmt/Layout.h
*** Xmt310/Xmt/Layout.h	Sun Feb  4 22:42:58 2001
--- Xmt310.ge/Xmt/Layout.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtLayout_h
  #define _XmtLayout_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtLayout_h
  #define _XmtLayout_h
diff -bpcBNC 5 Xmt310/Xmt/LayoutBox.c Xmt310.ge/Xmt/LayoutBox.c
*** Xmt310/Xmt/LayoutBox.c	Sun Feb  4 22:43:02 2001
--- Xmt310.ge/Xmt/LayoutBox.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/XmtP.h>
  #include <Xmt/LayoutGP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/XmtP.h>
  #include <Xmt/LayoutGP.h>
*************** Widget w;
*** 466,476 ****
      int *cmajorlen, *cminorlen; /* addresses of child dimensions */
      int next;
      int margin_width, margin_height, top_margin, left_margin;
      int *major_margin, *minor_margin;
      int space_stretch;
!     int total_space, space, interval;
      
      if (!XtIsManaged(w)) return;
  
      if (lb->layout_box.orientation == XmHORIZONTAL) row = True;
      else row = False;
--- 469,479 ----
      int *cmajorlen, *cminorlen; /* addresses of child dimensions */
      int next;
      int margin_width, margin_height, top_margin, left_margin;
      int *major_margin, *minor_margin;
      int space_stretch;
!     int total_space, space, interval = 0;
      
      if (!XtIsManaged(w)) return;
  
      if (lb->layout_box.orientation == XmHORIZONTAL) row = True;
      else row = False;
diff -bpcBNC 5 Xmt310/Xmt/LayoutCreate.c Xmt310.ge/Xmt/LayoutCreate.c
*** Xmt310/Xmt/LayoutCreate.c	Sun Feb  4 22:43:06 2001
--- Xmt310.ge/Xmt/LayoutCreate.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/XmtP.h>
  #include <Xmt/LayoutP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/XmtP.h>
  #include <Xmt/LayoutP.h>
diff -bpcBNC 5 Xmt310/Xmt/LayoutG.h Xmt310.ge/Xmt/LayoutG.h
*** Xmt310/Xmt/LayoutG.h	Sun Feb  4 22:43:10 2001
--- Xmt310.ge/Xmt/LayoutG.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtLayoutG_h
  #define _XmtLayoutG_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtLayoutG_h
  #define _XmtLayoutG_h
diff -bpcBNC 5 Xmt310/Xmt/LayoutGP.h Xmt310.ge/Xmt/LayoutGP.h
*** Xmt310/Xmt/LayoutGP.h	Sun Feb  4 22:43:14 2001
--- Xmt310.ge/Xmt/LayoutGP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtLayoutGP_h
  #define _XmtLayoutGP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtLayoutGP_h
  #define _XmtLayoutGP_h
diff -bpcBNC 5 Xmt310/Xmt/LayoutGadget.c Xmt310.ge/Xmt/LayoutGadget.c
*** Xmt310/Xmt/LayoutGadget.c	Sun Feb  4 22:43:18 2001
--- Xmt310.ge/Xmt/LayoutGadget.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/LayoutGP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/LayoutGP.h>
diff -bpcBNC 5 Xmt310/Xmt/LayoutP.h Xmt310.ge/Xmt/LayoutP.h
*** Xmt310/Xmt/LayoutP.h	Sun Feb  4 22:43:22 2001
--- Xmt310.ge/Xmt/LayoutP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtLayoutP_h
  #define _XmtLayoutP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtLayoutP_h
  #define _XmtLayoutP_h
diff -bpcBNC 5 Xmt310/Xmt/LayoutParse.c Xmt310.ge/Xmt/LayoutParse.c
*** Xmt310/Xmt/LayoutParse.c	Sun Feb  4 22:43:26 2001
--- Xmt310.ge/Xmt/LayoutParse.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ConvertersP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ConvertersP.h>
*************** XmtLayoutInfo *i;
*** 357,367 ****
  	ConsumeToken();
      }
  
      if (GetToken() == XmtLexerString) {
  	i->dummy_constraints.caption = (XmString)1;
! 	i->constraints.caption = XmtCreateXmString(GetStrValue());
  	i->constraints.dont_copy_caption = 1;
  	XtFree(GetStrValue());
  	ConsumeToken();
      }
      else
--- 360,370 ----
  	ConsumeToken();
      }
  
      if (GetToken() == XmtLexerString) {
  	i->dummy_constraints.caption = (XmString)1;
! 	i->constraints.caption = XmtCreateLocalizedXmString((Widget) lw, GetStrValue());
  	i->constraints.dont_copy_caption = 1;
  	XtFree(GetStrValue());
  	ConsumeToken();
      }
      else
diff -bpcBNC 5 Xmt310/Xmt/LayoutPixmap.c Xmt310.ge/Xmt/LayoutPixmap.c
*** Xmt310/Xmt/LayoutPixmap.c	Sun Feb  4 22:43:32 2001
--- Xmt310.ge/Xmt/LayoutPixmap.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/LayoutGP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/LayoutGP.h>
diff -bpcBNC 5 Xmt310/Xmt/LayoutS.c Xmt310.ge/Xmt/LayoutS.c
*** Xmt310/Xmt/LayoutS.c	Sun Feb  4 22:43:50 2001
--- Xmt310.ge/Xmt/LayoutS.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
diff -bpcBNC 5 Xmt310/Xmt/LayoutSep.c Xmt310.ge/Xmt/LayoutSep.c
*** Xmt310/Xmt/LayoutSep.c	Sun Feb  4 22:44:02 2001
--- Xmt310.ge/Xmt/LayoutSep.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/LayoutGP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/LayoutGP.h>
diff -bpcBNC 5 Xmt310/Xmt/LayoutSpace.c Xmt310.ge/Xmt/LayoutSpace.c
*** Xmt310/Xmt/LayoutSpace.c	Sun Feb  4 22:44:06 2001
--- Xmt310.ge/Xmt/LayoutSpace.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/LayoutGP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/LayoutGP.h>
diff -bpcBNC 5 Xmt310/Xmt/LayoutString.c Xmt310.ge/Xmt/LayoutString.c
*** Xmt310/Xmt/LayoutString.c	Sun Feb  4 22:44:12 2001
--- Xmt310.ge/Xmt/LayoutString.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/LayoutGP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/LayoutGP.h>
*************** Cardinal *num_args;
*** 214,224 ****
  	    XmStringCopy(ls->layout_string.label_string);
      else if (ls->layout_string.label) {
  	/* we don't copy the string; just convert it to an XmString */
  	/* and then set it to "" because we don't own it. */
  	ls->layout_string.label_string =
! 	    XmtCreateXmString(ls->layout_string.label);
  	ls->layout_string.label = empty_string;
      }
  
      MeasureString(lw, ls);
      GetGC(lw, ls);
--- 217,227 ----
  	    XmStringCopy(ls->layout_string.label_string);
      else if (ls->layout_string.label) {
  	/* we don't copy the string; just convert it to an XmString */
  	/* and then set it to "" because we don't own it. */
  	ls->layout_string.label_string =
! 	    XmtCreateLocalizedXmString((Widget) lw, ls->layout_string.label);
  	ls->layout_string.label = empty_string;
      }
  
      MeasureString(lw, ls);
      GetGC(lw, ls);
*************** Cardinal *num_args;
*** 259,286 ****
--- 262,302 ----
      XmtLayoutStringGadget cs = (XmtLayoutStringGadget) current;
      XmtLayoutStringGadget ss = (XmtLayoutStringGadget) set;
      XmtLayoutWidget lw = (XmtLayoutWidget) XtParent(set);
      Boolean redisplay = False;
      Boolean relayout = False;
+     Dimension cs_width, cs_height;
  
      if (ss->layout_string.label_string  != cs->layout_string.label_string) {
  	if (cs->layout_string.label_string)
  	    XmStringFree(cs->layout_string.label_string);
  	if (ss->layout_string.label_string)
  	    ss->layout_string.label_string =
  		XmStringCopy(ss->layout_string.label_string);
+         cs_width  = cs->layout_string.width;
+         cs_height = cs->layout_string.height;
  	MeasureString(lw, ss);
+         if (cs_width  != ss->layout_string.width ||
+                 cs_height != ss->layout_string.height)
              relayout = True;
+         else  
+             redisplay = True;
      }
      else if (ss->layout_string.label != empty_string) {
  	if (cs->layout_string.label_string)
  	    XmStringFree(cs->layout_string.label_string);
  	ss->layout_string.label_string =
  	    XmtCreateXmString(ss->layout_string.label);
  	ss->layout_string.label = empty_string;
+         cs_width  = cs->layout_string.width;
+         cs_height = cs->layout_string.height;
  	MeasureString(lw, ss);
+         if (cs_width  != ss->layout_string.width ||
+                 cs_height != ss->layout_string.height)
              relayout = True;
+         else
+             redisplay = True;
      }
  
      if (ss->layout_string.foreground != cs->layout_string.foreground) {
  	if (ss->layout_string.gc) XtReleaseGC(set, ss->layout_string.gc);
  	GetGC(lw, ss);
*************** Cardinal *num_args;
*** 312,326 ****
       * Returning True from this procedure doesn't do any good, presumably
       * because the Intrinsics think that we're an Object, not a RectObj
       * (This is one of the gross Motif hacks, described in Layout.c)
       * So we generate an Expose event ourselves.
       */
!     if ((redisplay | relayout) && XtIsRealized((Widget)lw))
  	XClearArea(XtDisplay((Widget)lw), XtWindow((Widget)lw),
  		   cs->rectangle.x, cs->rectangle.y,
  		   cs->rectangle.width, cs->rectangle.height,
  		   True);
      return False;
  }
  
  /* ARGSUSED */
  #if NeedFunctionPrototypes
--- 328,346 ----
       * Returning True from this procedure doesn't do any good, presumably
       * because the Intrinsics think that we're an Object, not a RectObj
       * (This is one of the gross Motif hacks, described in Layout.c)
       * So we generate an Expose event ourselves.
       */
!     if (redisplay && XtIsRealized((Widget)lw)) {
!          Redisplay((Widget)ss, (XEvent *)NULL, (Region)NULL);
!     }
!     else if ( relayout && XtIsRealized((Widget)lw)) {
          XClearArea(XtDisplay((Widget)lw), XtWindow((Widget)lw),
                     cs->rectangle.x, cs->rectangle.y,
                     cs->rectangle.width, cs->rectangle.height,
                     True);
+     }
      return False;
  }
  
  /* ARGSUSED */
  #if NeedFunctionPrototypes
diff -bpcBNC 5 Xmt310/Xmt/Lexer.c Xmt310.ge/Xmt/Lexer.c
*** Xmt310/Xmt/Lexer.c	Sun Feb  4 22:44:18 2001
--- Xmt310.ge/Xmt/Lexer.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
diff -bpcBNC 5 Xmt310/Xmt/Lexer.h Xmt310.ge/Xmt/Lexer.h
*** Xmt310/Xmt/Lexer.h	Sun Feb  4 22:44:22 2001
--- Xmt310.ge/Xmt/Lexer.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtLexer_h
  #define _XmtLexer_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtLexer_h
  #define _XmtLexer_h    
diff -bpcBNC 5 Xmt310/Xmt/Localize.c Xmt310.ge/Xmt/Localize.c
*** Xmt310/Xmt/Localize.c	Sun Feb  4 22:44:36 2001
--- Xmt310.ge/Xmt/Localize.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/XmtP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/XmtP.h>
diff -bpcBNC 5 Xmt310/Xmt/Lookup.c Xmt310.ge/Xmt/Lookup.c
*** Xmt310/Xmt/Lookup.c	Sun Feb  4 22:44:38 2001
--- Xmt310.ge/Xmt/Lookup.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/Xmt.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/Xmt.h>
diff -bpcBNC 5 Xmt310/Xmt/LookupP.h Xmt310.ge/Xmt/LookupP.h
*** Xmt310/Xmt/LookupP.h	Sun Feb  4 22:44:42 2001
--- Xmt310.ge/Xmt/LookupP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtLookupP_h
  #define _XmtLookupP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtLookupP_h
  #define _XmtLookupP_h
diff -bpcBNC 5 Xmt310/Xmt/Makefile.aimk Xmt310.ge/Xmt/Makefile.aimk
*** Xmt310/Xmt/Makefile.aimk	Thu Jan  1 01:00:00 1970
--- Xmt310.ge/Xmt/Makefile.aimk	Tue Jun 12 18:11:34 2001
***************
*** 0 ****
--- 1,502 ----
+ # Changes by _AA 20.7.95
+ # A changed version of the Xmt Makefile.aimk for
+ # use with aimk 
+ # The objects are build in the corresponding arch directory
+ # The CFLAGS,XCFLAGS and the SDIR variable are delivered by aimk
+ 
+ XMT_SDIR = ../Xmt310/Xmt
+ 
+ XMTFLAGS = $(CFLAGS) -I../Xmt310
+ 
+ XMT_SRCS =  \
+ 	$(XMT_SDIR)/All.c \
+ 	$(XMT_SDIR)/AppRes.c \
+ 	$(XMT_SDIR)/AskForBool.c \
+ 	$(XMT_SDIR)/AskForFile.c \
+ 	$(XMT_SDIR)/AskForItem.c \
+ 	$(XMT_SDIR)/AskForString.c \
+ 	$(XMT_SDIR)/AssertClass.c \
+ 	$(XMT_SDIR)/BSearch.c \
+ 	$(XMT_SDIR)/BitmapCvt.c \
+ 	$(XMT_SDIR)/Block.c \
+ 	$(XMT_SDIR)/CallbackCvt.c \
+ 	$(XMT_SDIR)/CheckFormat.c \
+ 	$(XMT_SDIR)/Chooser.c \
+ 	$(XMT_SDIR)/Cli.c \
+ 	$(XMT_SDIR)/Color.c \
+ 	$(XMT_SDIR)/ColorTable.c \
+ 	$(XMT_SDIR)/ColorTblCvt.c \
+ 	$(XMT_SDIR)/ContextHelp.c \
+ 	$(XMT_SDIR)/Create.c \
+ 	$(XMT_SDIR)/Cursor.c \
+ 	$(XMT_SDIR)/DECHack.c \
+ 	$(XMT_SDIR)/Dialog.c \
+ 	$(XMT_SDIR)/DialogPos.c \
+ 	$(XMT_SDIR)/Dialogs.c \
+ 	$(XMT_SDIR)/Discard.c \
+ 	$(XMT_SDIR)/EnumCvt.c \
+ 	$(XMT_SDIR)/FindFile.c \
+ 	$(XMT_SDIR)/FontListCvt.c \
+ 	$(XMT_SDIR)/GetPixmap.c \
+ 	$(XMT_SDIR)/HSLtoRGB.c \
+ 	$(XMT_SDIR)/Hash.c \
+ 	$(XMT_SDIR)/HelpBox.c \
+ 	$(XMT_SDIR)/HelpBrowser.c \
+ 	$(XMT_SDIR)/HelpNode.c \
+ 	$(XMT_SDIR)/IBMManage.c \
+ 	$(XMT_SDIR)/Icon.c \
+ 	$(XMT_SDIR)/Icons.c \
+ 	$(XMT_SDIR)/Include.c \
+ 	$(XMT_SDIR)/InitFocus.c \
+ 	$(XMT_SDIR)/Initialize.c \
+ 	$(XMT_SDIR)/InputField.c \
+ 	$(XMT_SDIR)/Layout.c \
+ 	$(XMT_SDIR)/LayoutBox.c \
+ 	$(XMT_SDIR)/LayoutCreate.c \
+ 	$(XMT_SDIR)/LayoutGadget.c \
+ 	$(XMT_SDIR)/LayoutParse.c \
+ 	$(XMT_SDIR)/LayoutPixmap.c \
+ 	$(XMT_SDIR)/LayoutSep.c \
+ 	$(XMT_SDIR)/LayoutSpace.c \
+ 	$(XMT_SDIR)/LayoutString.c \
+ 	$(XMT_SDIR)/Lexer.c \
+ 	$(XMT_SDIR)/Localize.c \
+ 	$(XMT_SDIR)/Lookup.c \
+ 	$(XMT_SDIR)/Menu.c \
+ 	$(XMT_SDIR)/MenuCvt.c \
+ 	$(XMT_SDIR)/MotifWidgets.c \
+ 	$(XMT_SDIR)/MsgDialogs.c \
+ 	$(XMT_SDIR)/MsgLine.c \
+ 	$(XMT_SDIR)/NameToWidget.c \
+ 	$(XMT_SDIR)/PixelCvt.c \
+ 	$(XMT_SDIR)/Pixmap.c \
+ 	$(XMT_SDIR)/PixmapCvt.c \
+ 	$(XMT_SDIR)/PixmapLstCvt.c \
+ 	$(XMT_SDIR)/Procedures.c \
+ 	$(XMT_SDIR)/Quarks.c \
+ 	$(XMT_SDIR)/RGBtoHSL.c \
+ 	$(XMT_SDIR)/Screen.c \
+ 	$(XMT_SDIR)/SetValue.c \
+ 	$(XMT_SDIR)/ShellUtil.c \
+ 	$(XMT_SDIR)/StringLstCvt.c \
+ 	$(XMT_SDIR)/Symbols.c \
+ 	$(XMT_SDIR)/Template.c \
+ 	$(XMT_SDIR)/Visual.c \
+ 	$(XMT_SDIR)/UnixProcs.c \
+ 	$(XMT_SDIR)/Wait.c \
+ 	$(XMT_SDIR)/Warning.c \
+ 	$(XMT_SDIR)/WidgetCvt.c \
+ 	$(XMT_SDIR)/WidgetType.c \
+ 	$(XMT_SDIR)/Working.c \
+ 	$(XMT_SDIR)/WorkingBox.c \
+ 	$(XMT_SDIR)/Xbm.c \
+ 	$(XMT_SDIR)/XmCSText.c \
+ 	$(XMT_SDIR)/XmComboBox.c \
+ 	$(XMT_SDIR)/XmScale.c \
+ 	$(XMT_SDIR)/XmStringCvt.c \
+ 	$(XMT_SDIR)/XmText.c \
+ 	$(XMT_SDIR)/XmTextField.c \
+ 	$(XMT_SDIR)/XmToggleB.c \
+ 	$(XMT_SDIR)/XmtProcs.c \
+ 	$(XMT_SDIR)/XmtWidgets.c \
+ 	$(XMT_SDIR)/Xpm.c \
+ 	$(XMT_SDIR)/XpmParse.c \
+ 	$(XMT_SDIR)/XtProcs.c\
+ 	$(XMT_SDIR)/ConvertData.c \
+ 	$(XMT_SDIR)/ChooserS.c\
+ 	$(XMT_SDIR)/CliS.c\
+ 	$(XMT_SDIR)/HelpBoxS.c\
+ 	$(XMT_SDIR)/HelpBrowserS.c\
+ 	$(XMT_SDIR)/InputFieldS.c\
+ 	$(XMT_SDIR)/LayoutS.c\
+ 	$(XMT_SDIR)/MenuS.c\
+ 	$(XMT_SDIR)/MsgLineS.c\
+ 	$(XMT_SDIR)/WorkingBoxS.c
+ 
+ XMT_OBJS =  \
+ 	All.o \
+ 	AppRes.o \
+ 	AskForBool.o \
+ 	AskForFile.o \
+ 	AskForItem.o \
+ 	AskForString.o \
+ 	AssertClass.o \
+ 	BSearch.o \
+ 	BitmapCvt.o \
+ 	Block.o \
+ 	CallbackCvt.o \
+ 	CheckFormat.o \
+ 	Chooser.o \
+ 	Cli.o \
+ 	Color.o \
+ 	ColorTable.o \
+ 	ColorTblCvt.o \
+ 	ContextHelp.o \
+ 	Create.o \
+ 	Cursor.o \
+ 	DECHack.o \
+ 	Dialog.o \
+ 	DialogPos.o \
+ 	Dialogs.o \
+ 	Discard.o \
+ 	EnumCvt.o \
+ 	FindFile.o \
+ 	FontListCvt.o \
+ 	GetPixmap.o \
+ 	HSLtoRGB.o \
+ 	Hash.o \
+ 	HelpBox.o \
+ 	HelpBrowser.o \
+ 	HelpNode.o \
+ 	IBMManage.o \
+ 	Icon.o \
+ 	Icons.o \
+ 	Include.o \
+ 	InitFocus.o \
+ 	Initialize.o \
+ 	InputField.o \
+ 	Layout.o \
+ 	LayoutBox.o \
+ 	LayoutCreate.o \
+ 	LayoutGadget.o \
+ 	LayoutParse.o \
+ 	LayoutPixmap.o \
+ 	LayoutSep.o \
+ 	LayoutSpace.o \
+ 	LayoutString.o \
+ 	Lexer.o \
+ 	Localize.o \
+ 	Lookup.o \
+ 	Menu.o \
+ 	MenuCvt.o \
+ 	MotifWidgets.o \
+ 	MsgDialogs.o \
+ 	MsgLine.o \
+ 	NameToWidget.o \
+ 	PixelCvt.o \
+ 	Pixmap.o \
+ 	PixmapCvt.o \
+ 	PixmapLstCvt.o \
+ 	Procedures.o \
+ 	Quarks.o \
+ 	RGBtoHSL.o \
+ 	Screen.o \
+ 	SetValue.o \
+ 	ShellUtil.o \
+ 	StringLstCvt.o \
+ 	Symbols.o \
+ 	Template.o \
+ 	Visual.o \
+ 	UnixProcs.o \
+ 	Wait.o \
+ 	Warning.o \
+ 	WidgetCvt.o \
+ 	WidgetType.o \
+ 	Working.o \
+ 	WorkingBox.o \
+ 	Xbm.o \
+    XmCSText.o \
+ 	XmComboBox.o \
+ 	XmScale.o \
+ 	XmStringCvt.o \
+ 	XmText.o \
+ 	XmTextField.o \
+ 	XmToggleB.o \
+ 	XmtProcs.o \
+ 	XmtWidgets.o \
+ 	Xpm.o \
+ 	XpmParse.o \
+ 	XtProcs.o 
+ 
+ XMT_UNSHAREDOBJS = \
+ 	ConvertData.o \
+ 	ChooserS.o\
+ 	CliS.o\
+ 	HelpBoxS.o\
+ 	HelpBrowserS.o\
+ 	InputFieldS.o\
+ 	LayoutS.o\
+ 	MenuS.o\
+ 	MsgLineS.o\
+ 	WorkingBoxS.o
+ 
+ XMT_HEADERS = \
+ 	$(XMT_SDIR)/All.h \
+ 	$(XMT_SDIR)/AppResP.h \
+ 	$(XMT_SDIR)/AppRes.h \
+ 	$(XMT_SDIR)/Chooser.h \
+ 	$(XMT_SDIR)/ChooserP.h \
+ 	$(XMT_SDIR)/Cli.h \
+ 	$(XMT_SDIR)/CliP.h \
+ 	$(XMT_SDIR)/Color.h \
+ 	$(XMT_SDIR)/Converters.h \
+ 	$(XMT_SDIR)/ConvertersP.h \
+ 	$(XMT_SDIR)/Create.h \
+ 	$(XMT_SDIR)/Dialog.h \
+ 	$(XMT_SDIR)/DialogP.h \
+ 	$(XMT_SDIR)/Dialogs.h \
+ 	$(XMT_SDIR)/DialogsP.h \
+ 	$(XMT_SDIR)/Hash.h \
+ 	$(XMT_SDIR)/Help.h \
+ 	$(XMT_SDIR)/HelpBox.h \
+ 	$(XMT_SDIR)/HelpBoxP.h \
+ 	$(XMT_SDIR)/HelpBrowser.h \
+ 	$(XMT_SDIR)/HelpBrowserP.h \
+ 	$(XMT_SDIR)/Icon.h\
+ 	$(XMT_SDIR)/Include.h \
+ 	$(XMT_SDIR)/InputField.h \
+ 	$(XMT_SDIR)/InputFieldP.h \
+ 	$(XMT_SDIR)/Layout.h \
+ 	$(XMT_SDIR)/LayoutG.h \
+ 	$(XMT_SDIR)/LayoutGP.h \
+ 	$(XMT_SDIR)/LayoutP.h \
+ 	$(XMT_SDIR)/Lexer.h \
+ 	$(XMT_SDIR)/LookupP.h \
+ 	$(XMT_SDIR)/Menu.h \
+ 	$(XMT_SDIR)/MenuP.h \
+ 	$(XMT_SDIR)/MsgLine.h \
+ 	$(XMT_SDIR)/MsgLineP.h \
+ 	$(XMT_SDIR)/Pixmap.h \
+ 	$(XMT_SDIR)/Procedures.h \
+ 	$(XMT_SDIR)/ProceduresP.h \
+ 	$(XMT_SDIR)/QuarksP.h \
+ 	$(XMT_SDIR)/ScreenP.h \
+ 	$(XMT_SDIR)/SetValue.h \
+ 	$(XMT_SDIR)/Symbols.h \
+ 	$(XMT_SDIR)/Template.h \
+ 	$(XMT_SDIR)/Util.h \
+ 	$(XMT_SDIR)/WidgetType.h \
+ 	$(XMT_SDIR)/WorkingBox.h \
+ 	$(XMT_SDIR)/WorkingBoxP.h \
+ 	$(XMT_SDIR)/Xbm.h \
+ 	$(XMT_SDIR)/Xmt.h \
+ 	$(XMT_SDIR)/XmtP.h \
+ 	$(XMT_SDIR)/Xpm.h
+ 
+ XMTLIB      = libXmt$(LIBEXT)
+ 
+ all: $(XMTLIB)
+ 
+ libXmt.a: $(XMT_OBJS) $(XMT_UNSHAREDOBJS)
+ 	$(AR) $(ARFLAGS) libXmt.a $(XMT_OBJS) $(XMT_UNSHAREDOBJS)
+ 	$(RANLIB) libXmt.a
+ 
+ libXmt$(SHAREDEXT): $(XMT_OBJS) $(XMT_UNSHAREDOBJS)
+ 	$(SHAREDLD) $(XLFLAGS) $(SHARED_LFLAGS) -o libXmt$(SHAREDEXT) $(XMT_OBJS) $(XMT_UNSHAREDOBJS) $(XLIBS)
+ 
+ #.c.o: $(SRCS) $(XMT_HEADERS)
+ #	$(CC) -c $(CFLAGS) $*.c 
+ 
+ 
+ All.o:		      $(XMT_SDIR)/All.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/All.c 
+ AppRes.o:		   $(XMT_SDIR)/AppRes.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AppRes.c 
+ AskForBool.o:     $(XMT_SDIR)/AskForBool.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AskForBool.c 
+ AskForFile.o:		$(XMT_SDIR)/AskForFile.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AskForFile.c 
+ AskForItem.o:		$(XMT_SDIR)/AskForItem.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AskForItem.c 
+ AskForString.o:	$(XMT_SDIR)/AskForString.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AskForString.c 
+ AssertClass.o:		$(XMT_SDIR)/AssertClass.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/AssertClass.c 
+ BSearch.o:		   $(XMT_SDIR)/BSearch.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/BSearch.c 
+ BitmapCvt.o:		$(XMT_SDIR)/BitmapCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/BitmapCvt.c 
+ Block.o:		      $(XMT_SDIR)/Block.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Block.c 
+ CallbackCvt.o:		$(XMT_SDIR)/CallbackCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/CallbackCvt.c 
+ CheckFormat.o:		$(XMT_SDIR)/CheckFormat.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/CheckFormat.c 
+ Chooser.o:		   $(XMT_SDIR)/Chooser.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Chooser.c 
+ Cli.o:		      $(XMT_SDIR)/Cli.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Cli.c 
+ Color.o:		      $(XMT_SDIR)/Color.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Color.c 
+ ColorTable.o:		$(XMT_SDIR)/ColorTable.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ColorTable.c 
+ ColorTblCvt.o:		$(XMT_SDIR)/ColorTblCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ColorTblCvt.c 
+ ContextHelp.o:		$(XMT_SDIR)/ContextHelp.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ContextHelp.c 
+ Create.o:		   $(XMT_SDIR)/Create.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Create.c 
+ Cursor.o:		   $(XMT_SDIR)/Cursor.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Cursor.c 
+ DECHack.o:		   $(XMT_SDIR)/DECHack.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/DECHack.c 
+ Dialog.o:		   $(XMT_SDIR)/Dialog.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Dialog.c 
+ DialogPos.o:		$(XMT_SDIR)/DialogPos.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/DialogPos.c 
+ Dialogs.o:		   $(XMT_SDIR)/Dialogs.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Dialogs.c 
+ Discard.o:		   $(XMT_SDIR)/Discard.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Discard.c 
+ EnumCvt.o:		   $(XMT_SDIR)/EnumCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/EnumCvt.c 
+ FindFile.o:		   $(XMT_SDIR)/FindFile.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/FindFile.c 
+ FontListCvt.o:		$(XMT_SDIR)/FontListCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/FontListCvt.c 
+ GetPixmap.o:		$(XMT_SDIR)/GetPixmap.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/GetPixmap.c 
+ HSLtoRGB.o:		   $(XMT_SDIR)/HSLtoRGB.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HSLtoRGB.c 
+ Hash.o:		      $(XMT_SDIR)/Hash.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Hash.c 
+ HelpBox.o:		   $(XMT_SDIR)/HelpBox.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HelpBox.c 
+ HelpBrowser.o:		$(XMT_SDIR)/HelpBrowser.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HelpBrowser.c 
+ HelpNode.o:		   $(XMT_SDIR)/HelpNode.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HelpNode.c 
+ IBMManage.o:		$(XMT_SDIR)/IBMManage.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/IBMManage.c 
+ Icon.o:		      $(XMT_SDIR)/Icon.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Icon.c 
+ Icons.o:		      $(XMT_SDIR)/Icons.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Icons.c 
+ Include.o:		   $(XMT_SDIR)/Include.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Include.c 
+ InitFocus.o:		$(XMT_SDIR)/InitFocus.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/InitFocus.c 
+ Initialize.o:		$(XMT_SDIR)/Initialize.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Initialize.c 
+ InputField.o:		$(XMT_SDIR)/InputField.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/InputField.c 
+ Layout.o:		   $(XMT_SDIR)/Layout.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Layout.c 
+ LayoutBox.o:		$(XMT_SDIR)/LayoutBox.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutBox.c 
+ LayoutCreate.o:   $(XMT_SDIR)/LayoutCreate.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutCreate.c 
+ LayoutGadget.o:	$(XMT_SDIR)/LayoutGadget.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutGadget.c 
+ LayoutParse.o:		$(XMT_SDIR)/LayoutParse.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutParse.c 
+ LayoutPixmap.o:	$(XMT_SDIR)/LayoutPixmap.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutPixmap.c 
+ LayoutSep.o:		$(XMT_SDIR)/LayoutSep.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutSep.c 
+ LayoutSpace.o:		$(XMT_SDIR)/LayoutSpace.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutSpace.c 
+ LayoutString.o:	$(XMT_SDIR)/LayoutString.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutString.c 
+ Lexer.o:		      $(XMT_SDIR)/Lexer.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Lexer.c 
+ Localize.o:		   $(XMT_SDIR)/Localize.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Localize.c 
+ Lookup.o:		   $(XMT_SDIR)/Lookup.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Lookup.c 
+ Menu.o:		      $(XMT_SDIR)/Menu.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Menu.c 
+ MenuCvt.o:		   $(XMT_SDIR)/MenuCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MenuCvt.c 
+ MotifWidgets.o:	$(XMT_SDIR)/MotifWidgets.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MotifWidgets.c 
+ MsgDialogs.o:		$(XMT_SDIR)/MsgDialogs.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MsgDialogs.c 
+ MsgLine.o:		   $(XMT_SDIR)/MsgLine.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MsgLine.c 
+ NameToWidget.o:	$(XMT_SDIR)/NameToWidget.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/NameToWidget.c 
+ PixelCvt.o:		   $(XMT_SDIR)/PixelCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/PixelCvt.c 
+ Pixmap.o:	  	   $(XMT_SDIR)/Pixmap.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Pixmap.c 
+ PixmapCvt.o:		$(XMT_SDIR)/PixmapCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/PixmapCvt.c 
+ PixmapLstCvt.o:	$(XMT_SDIR)/PixmapLstCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/PixmapLstCvt.c 
+ Procedures.o:		$(XMT_SDIR)/Procedures.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Procedures.c 
+ Quarks.o:		   $(XMT_SDIR)/Quarks.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Quarks.c 
+ RGBtoHSL.o:		   $(XMT_SDIR)/RGBtoHSL.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/RGBtoHSL.c 
+ Screen.o:		   $(XMT_SDIR)/Screen.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Screen.c 
+ SetValue.o:		   $(XMT_SDIR)/SetValue.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/SetValue.c 
+ ShellUtil.o:		$(XMT_SDIR)/ShellUtil.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ShellUtil.c 
+ StringLstCvt.o:   $(XMT_SDIR)/StringLstCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/StringLstCvt.c 
+ Symbols.o:		   $(XMT_SDIR)/Symbols.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Symbols.c 
+ Template.o:		   $(XMT_SDIR)/Template.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Template.c 
+ Visual.o:		   $(XMT_SDIR)/Visual.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Visual.c 
+ UnixProcs.o:		$(XMT_SDIR)/UnixProcs.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/UnixProcs.c 
+ Wait.o:		      $(XMT_SDIR)/Wait.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Wait.c 
+ Warning.o:		   $(XMT_SDIR)/Warning.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Warning.c 
+ WidgetCvt.o:		$(XMT_SDIR)/WidgetCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/WidgetCvt.c 
+ WidgetType.o:		$(XMT_SDIR)/WidgetType.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/WidgetType.c 
+ Working.o:		   $(XMT_SDIR)/Working.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Working.c 
+ WorkingBox.o:		$(XMT_SDIR)/WorkingBox.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/WorkingBox.c 
+ Xbm.o:		      $(XMT_SDIR)/Xbm.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Xbm.c 
+ XmCSText.o:		   $(XMT_SDIR)/XmCSText.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmCSText.c 
+ XmComboBox.o:		$(XMT_SDIR)/XmComboBox.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmComboBox.c 
+ XmScale.o:		   $(XMT_SDIR)/XmScale.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmScale.c 
+ XmStringCvt.o:		$(XMT_SDIR)/XmStringCvt.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmStringCvt.c 
+ XmText.o:		   $(XMT_SDIR)/XmText.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmText.c 
+ XmTextField.o:		$(XMT_SDIR)/XmTextField.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmTextField.c 
+ XmToggleB.o:		$(XMT_SDIR)/XmToggleB.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmToggleB.c 
+ XmtProcs.o:		   $(XMT_SDIR)/XmtProcs.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmtProcs.c 
+ XmtWidgets.o:		$(XMT_SDIR)/XmtWidgets.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XmtWidgets.c 
+ Xpm.o:		      $(XMT_SDIR)/Xpm.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/Xpm.c 
+ XpmParse.o:		   $(XMT_SDIR)/XpmParse.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XpmParse.c 
+ XtProcs.o:		   $(XMT_SDIR)/XtProcs.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/XtProcs.c 
+ 
+ ConvertData.o:	   $(XMT_SDIR)/ConvertData.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ConvertData.c 
+ ChooserS.o:		   $(XMT_SDIR)/ChooserS.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/ChooserS.c 
+ CliS.o:		      $(XMT_SDIR)/CliS.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/CliS.c 
+ HelpBoxS.o:		   $(XMT_SDIR)/HelpBoxS.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HelpBoxS.c 
+ HelpBrowserS.o:   $(XMT_SDIR)/HelpBrowserS.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/HelpBrowserS.c 
+ InputFieldS.o:		$(XMT_SDIR)/InputFieldS.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/InputFieldS.c 
+ LayoutS.o:		   $(XMT_SDIR)/LayoutS.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/LayoutS.c 
+ MenuS.o:		      $(XMT_SDIR)/MenuS.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MenuS.c 
+ MsgLineS.o:		   $(XMT_SDIR)/MsgLineS.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/MsgLineS.c 
+ WorkingBoxS.o:		$(XMT_SDIR)/WorkingBoxS.c $(XMT_HEADERS)
+ 	$(CC) -c $(XMTFLAGS) $(XCFLAGS) $(SHARED_CFLAGS) $(XMT_SDIR)/WorkingBoxS.c 
+ 
+ 
+ Xmt_clean:
+ 	$(RM) $(XMT_OBJS) $(XMT_UNSHAREDOBJS)
+ 	$(RM) libXmt.a libXmt$(SHAREDEXT)
diff -bpcBNC 5 Xmt310/Xmt/Menu.c Xmt310.ge/Xmt/Menu.c
*** Xmt310/Xmt/Menu.c	Sun Feb  4 22:45:26 2001
--- Xmt310.ge/Xmt/Menu.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/XmtP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/XmtP.h>
*************** Cardinal num_items;
*** 337,347 ****
  {
      XmtMenuWidget mw = (XmtMenuWidget) w;
      XmtMenuItem *item;
      Arg args[10], submenu_args[10];
      int n, m;
!     XmString accel_label;
      char namebuf[10], submenu_buf[20];
      char *name, *submenu_name;
      int numlabel, numpush, numtoggle, numsep, numsub;
      int i;
      static XrmQuark QBoolean = NULLQUARK;
--- 340,350 ----
  {
      XmtMenuWidget mw = (XmtMenuWidget) w;
      XmtMenuItem *item;
      Arg args[10], submenu_args[10];
      int n, m;
!     XmString accel_label = NULL;
      char namebuf[10], submenu_buf[20];
      char *name, *submenu_name;
      int numlabel, numpush, numtoggle, numsep, numsub;
      int i;
      static XrmQuark QBoolean = NULLQUARK;
*************** Cardinal num_items;
*** 414,424 ****
  		to.addr =(XPointer) &item->label1;
  		to.size = sizeof(Pixmap);
  		item->label1 = (XmString)XmUNSPECIFIED_PIXMAP;
  		XtConvertAndStore(w, XtRString, &from, XtRPixmap, &to);
  	    }
! 	    else item->label1 = XmtCreateXmString(item->alt_label);
  	}
  
  	/* if there is a normal label, create the XmString or pixmap */
  	if (item->label) {
  	    if (item->type & XmtMenuItemPixmap) {
--- 417,427 ----
  		to.addr =(XPointer) &item->label1;
  		to.size = sizeof(Pixmap);
  		item->label1 = (XmString)XmUNSPECIFIED_PIXMAP;
  		XtConvertAndStore(w, XtRString, &from, XtRPixmap, &to);
  	    }
! 	    else item->label1 = XmtCreateLocalizedXmString(w, item->alt_label);
  	}
  
  	/* if there is a normal label, create the XmString or pixmap */
  	if (item->label) {
  	    if (item->type & XmtMenuItemPixmap) {
*************** Cardinal num_items;
*** 429,439 ****
  		to.addr =(XPointer) &item->label0;
  		to.size = sizeof(Pixmap);
  		item->label0 = (XmString)XmUNSPECIFIED_PIXMAP;
  		XtConvertAndStore(w, XtRString, &from, XtRPixmap, &to);
  	    }
! 	    else item->label0 = XmtCreateXmString(item->label);
  	}
  
  	/*
  	 * if this is a toggle button w/ an alternate string and mnemonic,
  	 * set whichever is appopriate for the initial state.  Otherwise,
--- 432,442 ----
  		to.addr =(XPointer) &item->label0;
  		to.size = sizeof(Pixmap);
  		item->label0 = (XmString)XmUNSPECIFIED_PIXMAP;
  		XtConvertAndStore(w, XtRString, &from, XtRPixmap, &to);
  	    }
! 	    else item->label0 = XmtCreateLocalizedXmString(w, item->label);
  	}
  
  	/*
  	 * if this is a toggle button w/ an alternate string and mnemonic,
  	 * set whichever is appopriate for the initial state.  Otherwise,
diff -bpcBNC 5 Xmt310/Xmt/Menu.h Xmt310.ge/Xmt/Menu.h
*** Xmt310/Xmt/Menu.h	Sun Feb  4 22:45:30 2001
--- Xmt310.ge/Xmt/Menu.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtMenu_h
  #define _XmtMenu_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtMenu_h
  #define _XmtMenu_h    
diff -bpcBNC 5 Xmt310/Xmt/MenuCvt.c Xmt310.ge/Xmt/MenuCvt.c
*** Xmt310/Xmt/MenuCvt.c	Sun Feb  4 22:45:34 2001
--- Xmt310.ge/Xmt/MenuCvt.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <ctype.h>
  #include <stdio.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <ctype.h>
  #include <stdio.h>
*************** XmtMenuItem *item;
*** 394,406 ****
       * converter is registered.
       */
      tok = XmtLexerGetToken(l);
      if ((tok == XmtLexerIdent) || (tok == XmtLexerLBrace)) { /* a callback */
  	char *callback_string;
! 	int len;
  	XrmValue from, to;
! 	Boolean stat;
  	
  	if (tok == XmtLexerIdent) { /* a single callback */
  	    /* back up by the length of the current identifier */
  	    l->c -= XmtLexerStrLength(l);
  	    XtFree(XmtLexerStrValue(l));
--- 397,409 ----
       * converter is registered.
       */
      tok = XmtLexerGetToken(l);
      if ((tok == XmtLexerIdent) || (tok == XmtLexerLBrace)) { /* a callback */
  	char *callback_string;
! 	int len = 0;
  	XrmValue from, to;
! 	Boolean stat = False;
  	
  	if (tok == XmtLexerIdent) { /* a single callback */
  	    /* back up by the length of the current identifier */
  	    l->c -= XmtLexerStrLength(l);
  	    XtFree(XmtLexerStrValue(l));
diff -bpcBNC 5 Xmt310/Xmt/MenuP.h Xmt310.ge/Xmt/MenuP.h
*** Xmt310/Xmt/MenuP.h	Sun Feb  4 22:45:38 2001
--- Xmt310.ge/Xmt/MenuP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtMenuP_h
  #define _XmtMenuP_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtMenuP_h
  #define _XmtMenuP_h    
diff -bpcBNC 5 Xmt310/Xmt/MenuS.c Xmt310.ge/Xmt/MenuS.c
*** Xmt310/Xmt/MenuS.c	Sun Feb  4 22:45:40 2001
--- Xmt310.ge/Xmt/MenuS.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
diff -bpcBNC 5 Xmt310/Xmt/MotifWidgets.c Xmt310.ge/Xmt/MotifWidgets.c
*** Xmt310/Xmt/MotifWidgets.c	Sun Feb  4 22:45:48 2001
--- Xmt310.ge/Xmt/MotifWidgets.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
***************
*** 44,53 ****
--- 47,57 ----
  #if XmVersion >= 2000
  #include <Xm/Container.h>
  #include <Xm/IconG.h>
  #include <Xm/Notebook.h>
  #include <Xm/SpinB.h>
+ #include <Xm/ComboBox.h>
  #endif
  
  static XmtWidgetType motif_widgets[] = {
  {"XmArrowButton", NULL, XmCreateArrowButton},
  {"XmBulletinBoard", NULL, XmCreateBulletinBoard},
diff -bpcBNC 5 Xmt310/Xmt/MsgDialogs.c Xmt310.ge/Xmt/MsgDialogs.c
*** Xmt310/Xmt/MsgDialogs.c	Sun Feb  4 22:45:52 2001
--- Xmt310.ge/Xmt/MsgDialogs.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/DialogsP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/DialogsP.h>
*************** XtPointer tag, data;
*** 116,126 ****
      for(i=0; i < cache->num-1; i++)
  	if (cache->dialogs[i] == dialog) break;
  
      XtVaGetValues(dialog, XmNmessageString, &msg, NULL);
      blank = XmStringSeparatorCreate();
!     help = XmtCreateXmString(cache->help_strings[i]);
      s1 = XmStringConcat(msg, blank);
      s2 = XmStringConcat(s1, help);
      XtVaSetValues(dialog, XmNmessageString, s2, NULL);
      XmStringFree(msg);
      XmStringFree(blank);
--- 119,129 ----
      for(i=0; i < cache->num-1; i++)
  	if (cache->dialogs[i] == dialog) break;
  
      XtVaGetValues(dialog, XmNmessageString, &msg, NULL);
      blank = XmStringSeparatorCreate();
!     help = XmtCreateLocalizedXmString(w, cache->help_strings[i]);
      s1 = XmStringConcat(msg, blank);
      s2 = XmStringConcat(s1, help);
      XtVaSetValues(dialog, XmNmessageString, s2, NULL);
      XmStringFree(msg);
      XmStringFree(blank);
*************** Widget shell;
*** 228,238 ****
  String help_text;
  MsgDialogCache **cache_return;
  #endif
  {
      MsgDialogCache *cache;
!     Widget dialog, help_button;
      String help;
      
      /* the first time, create the hash table */
      if (!shell_to_cache_table)
  	shell_to_cache_table = XmtHashTableCreate(3);
--- 231,241 ----
  String help_text;
  MsgDialogCache **cache_return;
  #endif
  {
      MsgDialogCache *cache;
!     Widget dialog = 0, help_button;
      String help;
      
      /* the first time, create the hash table */
      if (!shell_to_cache_table)
  	shell_to_cache_table = XmtHashTableCreate(3);
*************** int style;
*** 449,460 ****
  	vsprintf(buffer, data.message, *msg_args);
  	data.message = buffer;
      }
      
      /* create XmStrings */
!     msg = XmtCreateXmString(data.message);
!     title = XmtCreateXmString(data.title);
      
      /*
       * reset the type of the dialog so that the next call will change it.
       * This is reqired to reset a custom icon back to the default icon
       * when the type doesn't change
--- 452,463 ----
  	vsprintf(buffer, data.message, *msg_args);
  	data.message = buffer;
      }
      
      /* create XmStrings */
!     msg = XmtCreateLocalizedXmString(w, data.message);
!     title = XmtCreateLocalizedXmString(w, data.title);
      
      /*
       * reset the type of the dialog so that the next call will change it.
       * This is reqired to reset a custom icon back to the default icon
       * when the type doesn't change
diff -bpcBNC 5 Xmt310/Xmt/MsgLine.c Xmt310.ge/Xmt/MsgLine.c
*** Xmt310/Xmt/MsgLine.c	Sun Feb  4 22:45:56 2001
--- Xmt310.ge/Xmt/MsgLine.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
   
  /*
   * Portions of this file are based upon work done by David Flanagan while
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
   
  /*
   * Portions of this file are based upon work done by David Flanagan while
diff -bpcBNC 5 Xmt310/Xmt/MsgLine.h Xmt310.ge/Xmt/MsgLine.h
*** Xmt310/Xmt/MsgLine.h	Sun Feb  4 22:45:58 2001
--- Xmt310.ge/Xmt/MsgLine.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtMsgLine_h
  #define _XmtMsgLine_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtMsgLine_h
  #define _XmtMsgLine_h    
diff -bpcBNC 5 Xmt310/Xmt/MsgLineP.h Xmt310.ge/Xmt/MsgLineP.h
*** Xmt310/Xmt/MsgLineP.h	Sun Feb  4 22:46:02 2001
--- Xmt310.ge/Xmt/MsgLineP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtMsgLineP_h
  #define _XmtMsgLineP_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtMsgLineP_h
  #define _XmtMsgLineP_h    
diff -bpcBNC 5 Xmt310/Xmt/MsgLineS.c Xmt310.ge/Xmt/MsgLineS.c
*** Xmt310/Xmt/MsgLineS.c	Sun Feb  4 22:46:06 2001
--- Xmt310.ge/Xmt/MsgLineS.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
diff -bpcBNC 5 Xmt310/Xmt/NameToWidget.c Xmt310.ge/Xmt/NameToWidget.c
*** Xmt310/Xmt/NameToWidget.c	Sun Feb  4 22:46:10 2001
--- Xmt310.ge/Xmt/NameToWidget.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * Portions of this file are derived from the Xt source code.
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  /*
   * Portions of this file are derived from the Xt source code.
diff -bpcBNC 5 Xmt310/Xmt/PixelCvt.c Xmt310.ge/Xmt/PixelCvt.c
*** Xmt310/Xmt/PixelCvt.c	Sun Feb  4 22:46:16 2001
--- Xmt310.ge/Xmt/PixelCvt.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/AppResP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/AppResP.h>
diff -bpcBNC 5 Xmt310/Xmt/Pixmap.c Xmt310.ge/Xmt/Pixmap.c
*** Xmt310/Xmt/Pixmap.c	Sun Feb  4 22:46:18 2001
--- Xmt310.ge/Xmt/Pixmap.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Pixmap.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Pixmap.h>
diff -bpcBNC 5 Xmt310/Xmt/Pixmap.h Xmt310.ge/Xmt/Pixmap.h
*** Xmt310/Xmt/Pixmap.h	Sun Feb  4 22:46:22 2001
--- Xmt310.ge/Xmt/Pixmap.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtPixmap_h
  #define _XmtPixmap_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtPixmap_h
  #define _XmtPixmap_h
diff -bpcBNC 5 Xmt310/Xmt/PixmapCvt.c Xmt310.ge/Xmt/PixmapCvt.c
*** Xmt310/Xmt/PixmapCvt.c	Sun Feb  4 22:46:26 2001
--- Xmt310.ge/Xmt/PixmapCvt.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Pixmap.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Pixmap.h>
diff -bpcBNC 5 Xmt310/Xmt/PixmapLstCvt.c Xmt310.ge/Xmt/PixmapLstCvt.c
*** Xmt310/Xmt/PixmapLstCvt.c	Sun Feb  4 22:46:28 2001
--- Xmt310.ge/Xmt/PixmapLstCvt.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
diff -bpcBNC 5 Xmt310/Xmt/Procedures.c Xmt310.ge/Xmt/Procedures.c
*** Xmt310/Xmt/Procedures.c	Sun Feb  4 22:46:34 2001
--- Xmt310.ge/Xmt/Procedures.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ProceduresP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ProceduresP.h>
diff -bpcBNC 5 Xmt310/Xmt/Procedures.h Xmt310.ge/Xmt/Procedures.h
*** Xmt310/Xmt/Procedures.h	Sun Feb  4 22:46:40 2001
--- Xmt310.ge/Xmt/Procedures.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtProcedures_h
  #define _XmtProcedures_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtProcedures_h
  #define _XmtProcedures_h
diff -bpcBNC 5 Xmt310/Xmt/ProceduresP.h Xmt310.ge/Xmt/ProceduresP.h
*** Xmt310/Xmt/ProceduresP.h	Sun Feb  4 22:46:44 2001
--- Xmt310.ge/Xmt/ProceduresP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtProceduresP_h
  #define _XmtProceduresP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtProceduresP_h
  #define _XmtProceduresP_h
diff -bpcBNC 5 Xmt310/Xmt/Quarks.c Xmt310.ge/Xmt/Quarks.c
*** Xmt310/Xmt/Quarks.c	Sun Feb  4 22:46:48 2001
--- Xmt310.ge/Xmt/Quarks.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/QuarksP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/QuarksP.h>
*************** externaldef(xmtqbuffer) XrmQuark XmtQBuf
*** 33,43 ****
  void _XmtInitQuarks(void)
  #else
  void _XmtInitQuarks()
  #endif
  {
!     static inited = False;
  
      if (inited == False) {
  	inited = True;
  
  	XmtQBool = XrmPermStringToQuark(XtRBool);
--- 36,46 ----
  void _XmtInitQuarks(void)
  #else
  void _XmtInitQuarks()
  #endif
  {
!     static Boolean inited = False;
  
      if (inited == False) {
  	inited = True;
  
  	XmtQBool = XrmPermStringToQuark(XtRBool);
diff -bpcBNC 5 Xmt310/Xmt/QuarksP.h Xmt310.ge/Xmt/QuarksP.h
*** Xmt310/Xmt/QuarksP.h	Sun Feb  4 22:46:50 2001
--- Xmt310.ge/Xmt/QuarksP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtQuarksP_h
  #define _XmtQuarksP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtQuarksP_h
  #define _XmtQuarksP_h
diff -bpcBNC 5 Xmt310/Xmt/RGBtoHSL.c Xmt310.ge/Xmt/RGBtoHSL.c
*** Xmt310/Xmt/RGBtoHSL.c	Sun Feb  4 22:46:56 2001
--- Xmt310.ge/Xmt/RGBtoHSL.c	Tue Jun 12 18:25:28 2001
***************
*** 1,18 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * RGB <--> HSL conversions were modified from code with the
   * following attributions;
   *
--- 1,23 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
+ 
+ #include <Xmt/Xmt.h>
  
  /*
   * RGB <--> HSL conversions were modified from code with the
   * following attributions;
   *
diff -bpcBNC 5 Xmt310/Xmt/Screen.c Xmt310.ge/Xmt/Screen.c
*** Xmt310/Xmt/Screen.c	Sun Feb  4 22:47:00 2001
--- Xmt310.ge/Xmt/Screen.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ScreenP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ScreenP.h>
diff -bpcBNC 5 Xmt310/Xmt/ScreenP.h Xmt310.ge/Xmt/ScreenP.h
*** Xmt310/Xmt/ScreenP.h	Sun Feb  4 22:47:06 2001
--- Xmt310.ge/Xmt/ScreenP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtScreenP_h
  #define _XmtScreenP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtScreenP_h
  #define _XmtScreenP_h
*************** typedef struct {
*** 23,32 ****
--- 26,40 ----
      Widget working_dialog;
      Widget string_dialog;     /* dialog for XmtAskForString() */
      Widget boolean_dialog;    /* dialog for XmtAskForBoolean() */
      Widget file_dialog;       /* dialog for by XmtAskForFilename() */
      Widget item_dialog;       /* dialog for XmtAskForItem[Number]() */
+ /* _AA added XmtAskForTime(), XmtAskForMemory() */
+     Widget time_dialog;
+     Widget memory_dialog;
+     Widget items_dialog;
+ /******_AA******************/
      struct {                  /* internal widgets of the boolean dialog */
  	Widget icon, message;
  	Widget yes, no, cancel, help;
  	Boolean show_cancel_button;
      } boolean_internals;
diff -bpcBNC 5 Xmt310/Xmt/SetValue.c Xmt310.ge/Xmt/SetValue.c
*** Xmt310/Xmt/SetValue.c	Sun Feb  4 22:47:08 2001
--- Xmt310.ge/Xmt/SetValue.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/SetValue.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/SetValue.h>
diff -bpcBNC 5 Xmt310/Xmt/SetValue.h Xmt310.ge/Xmt/SetValue.h
*** Xmt310/Xmt/SetValue.h	Sun Feb  4 22:47:12 2001
--- Xmt310.ge/Xmt/SetValue.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtSetValue_h
  #define _XmtSetValue_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtSetValue_h
  #define _XmtSetValue_h
diff -bpcBNC 5 Xmt310/Xmt/ShellUtil.c Xmt310.ge/Xmt/ShellUtil.c
*** Xmt310/Xmt/ShellUtil.c	Sun Feb  4 22:47:16 2001
--- Xmt310.ge/Xmt/ShellUtil.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ConvertersP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ConvertersP.h>
*************** Widget shell;
*** 68,78 ****
  int response;
  XtCallbackProc proc;
  XtPointer data;
  #endif
  {
!     static Atom wm_delete_window;
  
      if (!wm_delete_window) {
  	wm_delete_window = XmInternAtom(XtDisplay(shell),
  					"WM_DELETE_WINDOW", False);
      }
--- 71,81 ----
  int response;
  XtCallbackProc proc;
  XtPointer data;
  #endif
  {
!     static Atom wm_delete_window = 0;
  
      if (!wm_delete_window) {
  	wm_delete_window = XmInternAtom(XtDisplay(shell),
  					"WM_DELETE_WINDOW", False);
      }
*************** typedef enum {
*** 259,269 ****
  #define XmtNfocusStyle "focusStyle"
  #define XmtCFocusStyle "FocusStyle"
  #define XmtRFocusStyle "FocusStyle"
  
  static String focus_names[] = { "focus", "move", "none", "warp"};
! static int focus_values[] = {FocusSetInput, FocusMove, FocusNone, FocusWarp};
  
  static XtResource focus_resources[] = {
    {XmtNfocusStyle, XmtCFocusStyle, XmtRFocusStyle,
         sizeof(FocusStyle), 0, XmtRFocusStyle, (XtPointer) FocusStyleUnset}
  };
--- 262,272 ----
  #define XmtNfocusStyle "focusStyle"
  #define XmtCFocusStyle "FocusStyle"
  #define XmtRFocusStyle "FocusStyle"
  
  static String focus_names[] = { "focus", "move", "none", "warp"};
! static Cardinal focus_values[] = {FocusSetInput, FocusMove, FocusNone, FocusWarp};
  
  static XtResource focus_resources[] = {
    {XmtNfocusStyle, XmtCFocusStyle, XmtRFocusStyle,
         sizeof(FocusStyle), 0, XmtRFocusStyle, (XtPointer) FocusStyleUnset}
  };
diff -bpcBNC 5 Xmt310/Xmt/ShellUtil.h Xmt310.ge/Xmt/ShellUtil.h
*** Xmt310/Xmt/ShellUtil.h	Sun Feb  4 22:47:18 2001
--- Xmt310.ge/Xmt/ShellUtil.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtShellUtil_h
  #define _XmtShellUtil_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtShellUtil_h
  #define _XmtShellUtil_h
diff -bpcBNC 5 Xmt310/Xmt/StringLstCvt.c Xmt310.ge/Xmt/StringLstCvt.c
*** Xmt310/Xmt/StringLstCvt.c	Sun Feb  4 22:47:22 2001
--- Xmt310.ge/Xmt/StringLstCvt.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
diff -bpcBNC 5 Xmt310/Xmt/Symbols.c Xmt310.ge/Xmt/Symbols.c
*** Xmt310/Xmt/Symbols.c	Sun Feb  4 22:47:28 2001
--- Xmt310.ge/Xmt/Symbols.c	Tue Jun 12 18:25:28 2001
***************
*** 1,25 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Symbols.h>
  #include <Xmt/Hash.h>
  #include <Xmt/QuarksP.h>
  #include <X11/IntrinsicP.h>
  
  /*
   * values for the XmtSymbolRec mode field.
   */
  #define XmtSymbolABSOLUTE   1
  #define XmtSymbolIMMEDIATE  2
--- 1,36 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Symbols.h>
  #include <Xmt/Hash.h>
  #include <Xmt/QuarksP.h>
  #include <X11/IntrinsicP.h>
  
+ #if NeedFunctionPrototypes
+         void _XtCopyToArg(XtPointer, XtArgVal *, Cardinal);
+         void _XtCopyFromArg(XtArgVal, XtPointer, Cardinal);
+ #else
+         void _XtCopyToArg();
+         void _XtCopyFromArg();
+ #endif
+ 
  /*
   * values for the XmtSymbolRec mode field.
   */
  #define XmtSymbolABSOLUTE   1
  #define XmtSymbolIMMEDIATE  2
*************** void XmtSymbolSetValue(s, value)
*** 247,257 ****
  XmtSymbol s;
  XtArgVal value;
  #endif
  {
      XmtSymbolCallbackRec *p;
-     extern void _XtCopyFromArg();
      int index;
  
      /*
       * Special case for XmtRBuffer type symbols.
       * we copy the NULL-terminated string, and warn if it is too
--- 259,268 ----
*************** Cardinal size;
*** 326,336 ****
  {
      XrmQuark typeq = XrmStringToQuark(type);
      XrmValue from, to;
      XtArgVal converted_value;
      Boolean status;
-     extern void _XtCopyToArg();
  
      /*
       * if the types match, just call XmtSymbolSetValue().
       * if the symbol is a buffer, and the value a string, that is a match.
       */
--- 337,346 ----
*************** void XmtSymbolGetValue(XmtSymbol s, XtAr
*** 374,384 ****
  void XmtSymbolGetValue(s, valuep)
  XmtSymbol s;
  XtArgVal *valuep;
  #endif
  {
-     extern void _XtCopyToArg();
  
      /*
       * Special case for XmtRBuffer type symbols.
       * Just return the address.
       */
--- 384,393 ----
diff -bpcBNC 5 Xmt310/Xmt/Symbols.h Xmt310.ge/Xmt/Symbols.h
*** Xmt310/Xmt/Symbols.h	Sun Feb  4 22:47:30 2001
--- Xmt310.ge/Xmt/Symbols.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtSymbols_h
  #define _XmtSymbols_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtSymbols_h
  #define _XmtSymbols_h    
diff -bpcBNC 5 Xmt310/Xmt/Template.c Xmt310.ge/Xmt/Template.c
*** Xmt310/Xmt/Template.c	Sun Feb  4 22:47:34 2001
--- Xmt310.ge/Xmt/Template.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <ctype.h>
  #include <Xmt/Xmt.h>
diff -bpcBNC 5 Xmt310/Xmt/Template.h Xmt310.ge/Xmt/Template.h
*** Xmt310/Xmt/Template.h	Sun Feb  4 22:47:38 2001
--- Xmt310.ge/Xmt/Template.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtTemplate_h
  #define _XmtTemplate_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtTemplate_h
  #define _XmtTemplate_h
diff -bpcBNC 5 Xmt310/Xmt/UnixProcs.c Xmt310.ge/Xmt/UnixProcs.c
*** Xmt310/Xmt/UnixProcs.c	Sun Feb  4 22:47:42 2001
--- Xmt310.ge/Xmt/UnixProcs.c	Tue Jun 12 18:25:28 2001
***************
*** 1,35 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/Xmt.h>
  #include <Xmt/Procedures.h>
  
  #ifndef X_NOT_STDC_ENV
  #include <stdlib.h>
  #endif
  
  #ifndef X_NOT_POSIX
  #include <unistd.h>
  #endif
- 
- /* these aren't declared in SunOS 4.1.1 */
- extern int puts();
- extern int system();
- 
  
  static XmtProcedureInfo unix_procedures[] = {
  {"puts", (XmtProcedure)puts, {XtRString}},
  {"system", (XmtProcedure)system, {XtRString}},
  {"exit", (XmtProcedure)exit, {XtRInt}},
--- 1,34 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
+ #include <X11/Xos.h>
  #include <Xmt/Xmt.h>
  #include <Xmt/Procedures.h>
  
  #ifndef X_NOT_STDC_ENV
  #include <stdlib.h>
  #endif
  
  #ifndef X_NOT_POSIX
  #include <unistd.h>
  #endif
  
  static XmtProcedureInfo unix_procedures[] = {
  {"puts", (XmtProcedure)puts, {XtRString}},
  {"system", (XmtProcedure)system, {XtRString}},
  {"exit", (XmtProcedure)exit, {XtRInt}},
diff -bpcBNC 5 Xmt310/Xmt/Util.h Xmt310.ge/Xmt/Util.h
*** Xmt310/Xmt/Util.h	Sun Feb  4 22:47:48 2001
--- Xmt310.ge/Xmt/Util.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtUtil_h
  #define _XmtUtil_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtUtil_h
  #define _XmtUtil_h
*************** extern Widget XmtGetApplicationShell(Wid
*** 36,45 ****
--- 39,49 ----
  extern Widget XmtGetTopLevelShell(Widget) gcc_const_attribute;
  extern Widget XmtGetShell(Widget) gcc_const_attribute;
  extern String XmtFindFile(Widget, StringConst, StringConst,
  			  StringConst, StringConst, StringConst, int);
  extern XmString XmtCreateXmString(StringConst);
+ extern XmString XmtCreateLocalizedXmString(Widget, StringConst);
  extern Widget XmtNameToWidget(Widget, StringConst);
  extern void XmtWaitUntilMapped(Widget);
  extern void XmtDisplayBusyCursor(Widget);
  extern void XmtDisplayDefaultCursor(Widget);
  extern void XmtDisplayCursor(Widget, Cursor);
*************** extern void XmtRaiseShell(Widget);
*** 57,66 ****
--- 61,71 ----
  extern void XmtLowerShell(Widget);
  extern void XmtFocusShell(Widget);
  extern void XmtSetFocusToShell(Widget);
  extern void XmtWarpToShell(Widget);
  extern void XmtMoveShellToPointer(Widget);
+ extern String _XmtLocalize(Screen* , StringConst, StringConst, StringConst);
  extern String XmtLocalize(Widget, StringConst, StringConst);
  extern String XmtLocalizeWidget(Widget, StringConst, StringConst);
  extern String XmtLocalize2(Widget, StringConst, StringConst, StringConst);
  extern Visual *XmtGetVisual(Widget);
  extern void XmtPatchVisualInheritance(void);
*************** extern void XmtBlock();
*** 71,80 ****
--- 76,86 ----
  extern Widget XmtGetApplicationShell();
  extern Widget XmtGetTopLevelShell();
  extern Widget XmtGetShell();
  extern String XmtFindFile();
  extern XmString XmtCreateXmString();
+ extern XmString XmtCreateLocalizedXmString();
  extern Widget XmtNameToWidget();
  extern void XmtWaitUntilMapped();
  extern void XmtDisplayBusyCursor();
  extern void XmtDisplayDefaultCursor();
  extern void XmtDisplayCursor();
*************** extern void XmtRaiseShell();
*** 92,101 ****
--- 98,108 ----
  extern void XmtLowerShell();
  extern void XmtFocusShell();
  extern void XmtSetFocusToShell();
  extern void XmtWarpToShell();
  extern void XmtMoveShellToPointer();
+ extern String _XmtLocalize();
  extern String XmtLocalize();
  extern String XmtLocalizeWidget();
  extern String XmtLocalize2();
  extern Visual *XmtGetVisual();
  extern void XmtPatchVisualInheritance();
diff -bpcBNC 5 Xmt310/Xmt/Visual.c Xmt310.ge/Xmt/Visual.c
*** Xmt310/Xmt/Visual.c	Sun Feb  4 22:47:52 2001
--- Xmt310.ge/Xmt/Visual.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <X11/IntrinsicP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <X11/IntrinsicP.h>
diff -bpcBNC 5 Xmt310/Xmt/Wait.c Xmt310.ge/Xmt/Wait.c
*** Xmt310/Xmt/Wait.c	Sun Feb  4 22:47:56 2001
--- Xmt310.ge/Xmt/Wait.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Util.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/Util.h>
diff -bpcBNC 5 Xmt310/Xmt/Warning.c Xmt310.ge/Xmt/Warning.c
*** Xmt310/Xmt/Warning.c	Sun Feb  4 22:47:58 2001
--- Xmt310.ge/Xmt/Warning.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  
diff -bpcBNC 5 Xmt310/Xmt/WidgetCvt.c Xmt310.ge/Xmt/WidgetCvt.c
*** Xmt310/Xmt/WidgetCvt.c	Sun Feb  4 22:48:08 2001
--- Xmt310.ge/Xmt/WidgetCvt.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ConvertersP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ConvertersP.h>
diff -bpcBNC 5 Xmt310/Xmt/WidgetType.c Xmt310.ge/Xmt/WidgetType.c
*** Xmt310/Xmt/WidgetType.c	Sun Feb  4 22:48:18 2001
--- Xmt310.ge/Xmt/WidgetType.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/XmtP.h>
  #include <Xmt/WidgetType.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/XmtP.h>
  #include <Xmt/WidgetType.h>
diff -bpcBNC 5 Xmt310/Xmt/WidgetType.h Xmt310.ge/Xmt/WidgetType.h
*** Xmt310/Xmt/WidgetType.h	Sun Feb  4 22:48:24 2001
--- Xmt310.ge/Xmt/WidgetType.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtWidgetType_h
  #define _XmtWidgetType_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtWidgetType_h
  #define _XmtWidgetType_h
*************** extern void XmtRegisterXmtWidgets(void);
*** 55,64 ****
--- 58,70 ----
  extern void XmtRegisterXmText(void);
  extern void XmtRegisterXmScrolledText(void);
  extern void XmtRegisterXmTextField(void);
  extern void XmtRegisterXmToggleButton(void);
  extern void XmtRegisterXmScale(void);
+ #if XmVersion >= 2000
+ extern void XmtRegisterXmComboBox(void);
+ #endif
  #else
  extern void XmtRegisterWidgetClass();
  extern void XmtRegisterWidgetConstructor();
  extern void XmtRegisterPopupClass();
  extern void XmtRegisterPopupConstructor();
*************** extern void XmtRegisterXmtWidgets();
*** 70,79 ****
--- 76,90 ----
  extern void XmtRegisterXmText();
  extern void XmtRegisterXmScrolledText();
  extern void XmtRegisterXmTextField();
  extern void XmtRegisterXmToggleButton();
  extern void XmtRegisterXmScale();
+ 
+ #if XmVersion >= 2000
+ extern void XmtRegisterXmComboBox();
+ #endif
+ 
  #endif
  
  #if NeedVarargsPrototypes
  extern void XmtVaRegisterWidgetClasses(StringConst, WidgetClass, ...);
  extern void XmtVaRegisterWidgetConstructors(StringConst,
diff -bpcBNC 5 Xmt310/Xmt/Working.c Xmt310.ge/Xmt/Working.c
*** Xmt310/Xmt/Working.c	Sun Feb  4 22:48:30 2001
--- Xmt310.ge/Xmt/Working.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WorkingBox.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WorkingBox.h>
*************** int show_button;
*** 130,140 ****
  	data.scale_label = (String) scale_label_default;
  	data.button_label = (String) button_label_default;
  	data.title = default_title;
      }
  
!     title = XmtCreateXmString(data.title);
      XtVaSetValues(info->working_dialog,
  		  XmtNmessage, data.message,
  		  XmtNscaleLabel, data.scale_label,
  		  XmtNbuttonLabel, data.button_label,
  		  XmNdialogTitle, title,
--- 133,143 ----
  	data.scale_label = (String) scale_label_default;
  	data.button_label = (String) button_label_default;
  	data.title = default_title;
      }
  
!     title = XmtCreateLocalizedXmString(w, data.title);
      XtVaSetValues(info->working_dialog,
  		  XmtNmessage, data.message,
  		  XmtNscaleLabel, data.scale_label,
  		  XmtNbuttonLabel, data.button_label,
  		  XmNdialogTitle, title,
diff -bpcBNC 5 Xmt310/Xmt/WorkingBox.c Xmt310.ge/Xmt/WorkingBox.c
*** Xmt310/Xmt/WorkingBox.c	Sun Feb  4 22:48:34 2001
--- Xmt310.ge/Xmt/WorkingBox.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/XmtP.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/XmtP.h>
*************** Cardinal *num_args;
*** 280,290 ****
  	    XmtLocalizeWidget(init, "Stop", "stop");
  
      /*
       * create the widgets
       */
!     label = XmtCreateXmString(wd->working_box.message);
      pixmap = XtVaCreateManagedWidget("icon", xmtLayoutPixmapGadgetClass, init,
  			XmtNpixmap, wd->working_box.icon,
  			XmtNlayoutCaption, label,
  			XmtNlayoutCaptionPosition, XmtLayoutRight,
  			XmtNlayoutCaptionJustification, XmtLayoutFlushLeft,
--- 283,293 ----
  	    XmtLocalizeWidget(init, "Stop", "stop");
  
      /*
       * create the widgets
       */
!     label = XmtCreateLocalizedXmString((Widget)wd, wd->working_box.message);
      pixmap = XtVaCreateManagedWidget("icon", xmtLayoutPixmapGadgetClass, init,
  			XmtNpixmap, wd->working_box.icon,
  			XmtNlayoutCaption, label,
  			XmtNlayoutCaptionPosition, XmtLayoutRight,
  			XmtNlayoutCaptionJustification, XmtLayoutFlushLeft,
*************** Cardinal *num_args;
*** 292,302 ****
  			XmtNlayoutJustification, XmtLayoutFlushLeft,
  			XmtNlayoutStretchability, 0,
  			NULL);
      XmStringFree(label);
  
!     label = XmtCreateXmString(wd->working_box.scale_label);
      scale = XtVaCreateWidget("scale", xmScaleWidgetClass, init,
  			 XmNorientation, XmHORIZONTAL,
  			 XmNshowValue, True,
  			 XmNvalue, wd->working_box.scale_value,
  			 XmNminimum, wd->working_box.scale_min,
--- 295,305 ----
  			XmtNlayoutJustification, XmtLayoutFlushLeft,
  			XmtNlayoutStretchability, 0,
  			NULL);
      XmStringFree(label);
  
!     label = XmtCreateLocalizedXmString((Widget)wd, wd->working_box.scale_label);
      scale = XtVaCreateWidget("scale", xmScaleWidgetClass, init,
  			 XmNorientation, XmHORIZONTAL,
  			 XmNshowValue, True,
  			 XmNvalue, wd->working_box.scale_value,
  			 XmNminimum, wd->working_box.scale_min,
*************** Cardinal *num_args;
*** 312,322 ****
  
      separator = XtVaCreateWidget("separator",
  				 xmtLayoutSeparatorGadgetClass, init,
  				 NULL);
  
!     label = XmtCreateXmString(wd->working_box.button_label);
      button = XtVaCreateWidget("button", xmPushButtonWidgetClass, init,
  			      XmNlabelString, label,
  			      XmtNlayoutJustification, XmtLayoutFlushRight,
  			      XmtNlayoutStretchability, 0,
  			      NULL);
--- 315,325 ----
  
      separator = XtVaCreateWidget("separator",
  				 xmtLayoutSeparatorGadgetClass, init,
  				 NULL);
  
!     label = XmtCreateLocalizedXmString((Widget)wd, wd->working_box.button_label);
      button = XtVaCreateWidget("button", xmPushButtonWidgetClass, init,
  			      XmNlabelString, label,
  			      XmtNlayoutJustification, XmtLayoutFlushRight,
  			      XmtNlayoutStretchability, 0,
  			      NULL);
*************** Cardinal *num_args;
*** 387,417 ****
       * strings are not copied, but set to a special empty string.
       * We check if they are now different from empty_string.
       */
      if (sw->working_box.message != empty_string) {
  	if (sw->working_box.message)
! 	    label = XmtCreateXmString(sw->working_box.message);
  	else
  	    label = NULL;
  	XtVaSetValues(sw->working_box.pixmap, XmtNlayoutCaption, label, NULL);
  	if (label) XmStringFree(label);
  	sw->working_box.message = empty_string;
      }
  
      if (sw->working_box.scale_label != empty_string) {
  	if (sw->working_box.scale_label)
! 	    label = XmtCreateXmString(sw->working_box.scale_label);
  	else
  	    label = NULL;
  	XtVaSetValues(sw->working_box.scale, XmtNlayoutCaption, label, NULL);
  	if (label) XmStringFree(label);
  	sw->working_box.scale_label = empty_string;
      }
  
      if (sw->working_box.button_label != empty_string) {
  	if (sw->working_box.button_label) {
! 	    label = XmtCreateXmString(sw->working_box.button_label);
  	    XtVaSetValues(sw->working_box.button, XmNlabelString, label, NULL);
  	    XmStringFree(label);
  	}
  	sw->working_box.button_label = empty_string;
      }
--- 390,420 ----
       * strings are not copied, but set to a special empty string.
       * We check if they are now different from empty_string.
       */
      if (sw->working_box.message != empty_string) {
  	if (sw->working_box.message)
! 	    label = XmtCreateLocalizedXmString((Widget)sw, sw->working_box.message);
  	else
  	    label = NULL;
  	XtVaSetValues(sw->working_box.pixmap, XmtNlayoutCaption, label, NULL);
  	if (label) XmStringFree(label);
  	sw->working_box.message = empty_string;
      }
  
      if (sw->working_box.scale_label != empty_string) {
  	if (sw->working_box.scale_label)
! 	    label = XmtCreateLocalizedXmString((Widget)sw, sw->working_box.scale_label);
  	else
  	    label = NULL;
  	XtVaSetValues(sw->working_box.scale, XmtNlayoutCaption, label, NULL);
  	if (label) XmStringFree(label);
  	sw->working_box.scale_label = empty_string;
      }
  
      if (sw->working_box.button_label != empty_string) {
  	if (sw->working_box.button_label) {
! 	    label = XmtCreateLocalizedXmString((Widget)sw, sw->working_box.button_label);
  	    XtVaSetValues(sw->working_box.button, XmNlabelString, label, NULL);
  	    XmStringFree(label);
  	}
  	sw->working_box.button_label = empty_string;
      }
diff -bpcBNC 5 Xmt310/Xmt/WorkingBox.h Xmt310.ge/Xmt/WorkingBox.h
*** Xmt310/Xmt/WorkingBox.h	Sun Feb  4 22:48:38 2001
--- Xmt310.ge/Xmt/WorkingBox.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtWorkingBox_h
  #define _XmtWorkingBox_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtWorkingBox_h
  #define _XmtWorkingBox_h    
diff -bpcBNC 5 Xmt310/Xmt/WorkingBoxP.h Xmt310.ge/Xmt/WorkingBoxP.h
*** Xmt310/Xmt/WorkingBoxP.h	Sun Feb  4 22:48:40 2001
--- Xmt310.ge/Xmt/WorkingBoxP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtWorkingBoxP_h
  #define _XmtWorkingBoxP_h    
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtWorkingBoxP_h
  #define _XmtWorkingBoxP_h    
diff -bpcBNC 5 Xmt310/Xmt/WorkingBoxS.c Xmt310.ge/Xmt/WorkingBoxS.c
*** Xmt310/Xmt/WorkingBoxS.c	Sun Feb  4 22:48:44 2001
--- Xmt310.ge/Xmt/WorkingBoxS.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  #include <X11/Intrinsic.h>
  #ifndef _Xconst
  #if __STDC__ || defined(__cplusplus) || defined(c_plusplus)
diff -bpcBNC 5 Xmt310/Xmt/Xbm.c Xmt310.ge/Xmt/Xbm.c
*** Xmt310/Xmt/Xbm.c	Sun Feb  4 22:48:48 2001
--- Xmt310.ge/Xmt/Xbm.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <ctype.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <ctype.h>
diff -bpcBNC 5 Xmt310/Xmt/Xbm.h Xmt310.ge/Xmt/Xbm.h
*** Xmt310/Xmt/Xbm.h	Sun Feb  4 22:48:52 2001
--- Xmt310.ge/Xmt/Xbm.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtXbm_h
  #define _XmtXbm_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtXbm_h
  #define _XmtXbm_h
diff -bpcBNC 5 Xmt310/Xmt/XmCSText.c Xmt310.ge/Xmt/XmCSText.c
*** Xmt310/Xmt/XmCSText.c	Sun Feb  4 22:48:54 2001
--- Xmt310.ge/Xmt/XmCSText.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * This file courtesy of Tony Hefner.
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  /*
   * This file courtesy of Tony Hefner.
*************** Cardinal size;
*** 38,53 ****
  {
      XmString xmString = NULL;
  
      if (type == XmtQString) {
          /* Convert the value to an XmString. */
!         xmString = XmtCreateXmString(*(String *)address);
  	XmCSTextSetString(w, xmString);
      }
      else if (type == XmtQBuffer) {
          /* Convert the value to an XmString. */
!         xmString = XmtCreateXmString((char *)address);
  	XmCSTextSetString(w, xmString);
      }
      else
  	XmtWarningMsg("XmtDialogSetDialogValues", "xmcstext",
  		      "Type mismatch:\n\tCan't set value from resource of type '%s'.  String or Buffer expected.",
--- 41,56 ----
  {
      XmString xmString = NULL;
  
      if (type == XmtQString) {
          /* Convert the value to an XmString. */
!         xmString = XmtCreateLocalizedXmString(w, *(String *)address);
  	XmCSTextSetString(w, xmString);
      }
      else if (type == XmtQBuffer) {
          /* Convert the value to an XmString. */
!         xmString = XmtCreateLocalizedXmString(w, (char *)address);
  	XmCSTextSetString(w, xmString);
      }
      else
  	XmtWarningMsg("XmtDialogSetDialogValues", "xmcstext",
  		      "Type mismatch:\n\tCan't set value from resource of type '%s'.  String or Buffer expected.",
*************** Cardinal size;
*** 109,127 ****
  }
  
  static XmtWidgetType cstext = {
      "XmCSText",
      NULL,
!     XmCreateCSText,
      setvalue,
      getvalue,
  };
  
  static XmtWidgetType scstext = {
      "XmScrolledCSText",
      NULL,
!     XmCreateScrolledCSText,
      setvalue,
      getvalue,
  };
  
  #if NeedFunctionPrototypes
--- 112,130 ----
  }
  
  static XmtWidgetType cstext = {
      "XmCSText",
      NULL,
!     (XmtWidgetConstructor) XmCreateCSText,
      setvalue,
      getvalue,
  };
  
  static XmtWidgetType scstext = {
      "XmScrolledCSText",
      NULL,
!     (XmtWidgetConstructor) XmCreateScrolledCSText,
      setvalue,
      getvalue,
  };
  
  #if NeedFunctionPrototypes
diff -bpcBNC 5 Xmt310/Xmt/XmComboBox.c Xmt310.ge/Xmt/XmComboBox.c
*** Xmt310/Xmt/XmComboBox.c	Sun Feb  4 22:48:58 2001
--- Xmt310.ge/Xmt/XmComboBox.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * This file courtesy of Tony Hefner.
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  /*
   * This file courtesy of Tony Hefner.
diff -bpcBNC 5 Xmt310/Xmt/XmScale.c Xmt310.ge/Xmt/XmScale.c
*** Xmt310/Xmt/XmScale.c	Sun Feb  4 22:49:02 2001
--- Xmt310.ge/Xmt/XmScale.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
diff -bpcBNC 5 Xmt310/Xmt/XmStringCvt.c Xmt310.ge/Xmt/XmStringCvt.c
*** Xmt310/Xmt/XmStringCvt.c	Sun Feb  4 22:49:04 2001
--- Xmt310.ge/Xmt/XmStringCvt.c	Tue Jun 12 18:25:28 2001
***************
*** 1,23 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/ConvertersP.h>
  
! #if XmVersion >= 2000
  /**
   * Gary Merrill figured out how XmString parsing works in Motif 2.0, and
   * how rendition tables and tabs are handled, and wrote this code for
   * Motif 2.0.  David Flanagan tweaked the resulting code a bit.
   *
--- 1,29 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
+ 
+ #include <stdlib.h>
  #include <Xmt/Xmt.h>
  #include <Xmt/ConvertersP.h>
  
! #if 0 
! /* #if XmVersion >= 2000 */
  /**
   * Gary Merrill figured out how XmString parsing works in Motif 2.0, and
   * how rendition tables and tabs are handled, and wrote this code for
   * Motif 2.0.  David Flanagan tweaked the resulting code a bit.
   *
*************** XtPointer call_data;
*** 57,66 ****
--- 63,74 ----
  #endif
  {
      char *s, *start, *text_ptr, indicator, *tag, tag_buf[3];
      XmStringComponentType component_type;
  
+ /* printf("...> '%s'\n", (char *) *text); */
+ 
      text_ptr = (char *) *text;
      start = s = XtNewString(*text);
      
      /* s[0] should be '@'.  Bump pointer to following char */
      s++;
*************** XtPointer call_data;
*** 98,110 ****
     indicator = *s;
  
     switch (component_type) {
  
     case XmSTRING_COMPONENT_UNKNOWN:
!        if ( indicator == '[' )
  	   XmtWarningMsg("XmtCreateXmString", "badlocale",
! 			 "'@[' locale indicator may occur only at beginning of string.");
         
         XmtWarningMsg("XmtCreateXmString", "unrecognized",
  		     "Unrecognized string escape sequence '@%c' will be treated as text.",
  		     indicator);
         s++;
--- 106,118 ----
     indicator = *s;
  
     switch (component_type) {
  
     case XmSTRING_COMPONENT_UNKNOWN:
!        if ( indicator == '{' )
             XmtWarningMsg("XmtCreateXmString", "badlocale",
!                          "'@{' locale indicator may occur only at beginning of string.");
         
         XmtWarningMsg("XmtCreateXmString", "unrecognized",
                       "Unrecognized string escape sequence '@%c' will be treated as text.",
                       indicator);
         s++;
*************** StringConst str;
*** 199,234 ****
  {
      static Boolean parse_table_registered = False;
      static XmParseMapping parse_table[3];
      
      if (!parse_table_registered) {
! 	Arg args[3];
  	int n;
  	
  	n = 0;
  	XtSetArg(args[n], XmNpattern, "\n"); n++;
  	XtSetArg(args[n], XmNincludeStatus, XmINSERT); n++;
  	XtSetArg(args[n], XmNsubstitute,XmStringSeparatorCreate());n++;
  	parse_table[0] = XmParseMappingCreate(args, n);
  	
  	n = 0;
  	XtSetArg(args[n], XmNpattern, "\t"); n++;
  	XtSetArg(args[n], XmNincludeStatus, XmINSERT); n++;
  	XtSetArg(args[n], XmNsubstitute,
  		 XmStringComponentCreate(XmSTRING_COMPONENT_TAB, 0,NULL)); n++;
  	parse_table[1] = XmParseMappingCreate(args, n);
  	
  	n = 0;
  	XtSetArg(args[n], XmNpattern, "@"); n++;
  	XtSetArg(args[n], XmNincludeStatus, XmINVOKE); n++;
  	XtSetArg(args[n], XmNinvokeParseProc, XmtConvertStringEscape); n++;
  	parse_table[2] = XmParseMappingCreate(args, n);
  	
  	parse_table_registered = True;
      }
      
!     return XmStringParseText((XtPointer) str, NULL, NULL, XmCHARSET_TEXT,
  			     parse_table, XtNumber(parse_table),
  			     NULL);
  }
  
  #else  /* XmVersion < 2000 */
--- 207,245 ----
  {
      static Boolean parse_table_registered = False;
      static XmParseMapping parse_table[3];
      
      if (!parse_table_registered) {
!         Arg args[4];
          int n;
          
          n = 0;
          XtSetArg(args[n], XmNpattern, "\n"); n++;
+         XtSetArg(args[n], XmNpatternType, XmMULTIBYTE_TEXT); n++;
          XtSetArg(args[n], XmNincludeStatus, XmINSERT); n++;
          XtSetArg(args[n], XmNsubstitute,XmStringSeparatorCreate());n++;
          parse_table[0] = XmParseMappingCreate(args, n);
          
          n = 0;
          XtSetArg(args[n], XmNpattern, "\t"); n++;
+         XtSetArg(args[n], XmNpatternType, XmMULTIBYTE_TEXT); n++;
          XtSetArg(args[n], XmNincludeStatus, XmINSERT); n++;
          XtSetArg(args[n], XmNsubstitute,
                   XmStringComponentCreate(XmSTRING_COMPONENT_TAB, 0,NULL)); n++;
          parse_table[1] = XmParseMappingCreate(args, n);
          
          n = 0;
          XtSetArg(args[n], XmNpattern, "@"); n++;
+         XtSetArg(args[n], XmNpatternType, XmMULTIBYTE_TEXT); n++;
          XtSetArg(args[n], XmNincludeStatus, XmINVOKE); n++;
          XtSetArg(args[n], XmNinvokeParseProc, XmtConvertStringEscape); n++;
          parse_table[2] = XmParseMappingCreate(args, n);
          
          parse_table_registered = True;
      }
      
!     return XmStringParseText((XtPointer) str, NULL, NULL, XmMULTIBYTE_TEXT,
                               parse_table, XtNumber(parse_table),
                               NULL);
  }
  
  #else  /* XmVersion < 2000 */
*************** XmString to;
*** 243,252 ****
--- 254,306 ----
  int sep;
  char *charset;
  int fixup;
  #endif
  {
+ #if 0
+    XmString s1, s2;
+    char *mtxt = NULL;
+       
+    if (fixup) {
+       wchar_t *s, *t;
+       wchar_t *ws = NULL;
+       int n;
+ 
+       n = mbstowcs(NULL, txt, 0);
+       if (n>0) {
+          ws = (wchar_t*)malloc(sizeof(wchar_t)*(n+1));
+       }
+       if (ws) {
+          mbstowcs(ws, txt, (n+1));
+       }  
+       for(s=t=ws; *s; s++, t++) {
+             *t = *s;
+             if ((*s == L'@') && (*(s+1) == L'@')) s++;
+        }
+        *t = *s;  /* copy the terminating '\0' */
+        n = wcstombs(NULL, ws, 0);
+        if (n > 0) {
+          mtxt = (char*)malloc(sizeof(char)*(n+1));
+       }
+       if (mtxt) {
+          wcstombs(mtxt, ws, (n+1));
+       }  
+       else {
+          mtxt = strdup(txt);
+       }   
+       XtFree((char*)ws);
+    }
+ 
+    s1 = XmStringSegmentCreate(mtxt, charset, XmSTRING_DIRECTION_L_TO_R, sep);
+    if (!to) return s1;
+    s2 = XmStringConcat(to, s1);
+    XmStringFree(to);
+    XmStringFree(s1);
+    XtFree(mtxt);
+    return s2;
+ 
+ #else
      XmString s1, s2;
      char *s, *t;
  
      if (fixup) {
          for(s=t=txt; *s; s++, t++) {
*************** int fixup;
*** 260,278 ****
--- 314,334 ----
      if (!to) return s1;
      s2 = XmStringConcat(to, s1);
      XmStringFree(to);
      XmStringFree(s1);
      return s2;
+ #endif    
  }
  
  #if NeedFunctionPrototypes
  XmString XmtCreateXmString(StringConst str)
  #else
  XmString XmtCreateXmString(str)
  StringConst str;
  #endif
  {
+ #if 0
      String r, s, t;
  #ifdef XMSTRING_TO_COMPOUND_TEXT_BUG
      String charset = XmSTRING_DEFAULT_CHARSET;
  #else    
  #  if XmVersion < 1002
*************** StringConst str;
*** 343,423 ****
  
  	    t = s+1;
  	    break;
  	}
      }
  
      if (s != t) result = appendstring(t, result, False, charset, fixup);
      
      XtFree(r);
      return result;
  }
  
  #endif /* XmVersion >= 2000 */
  
  /* ARGSUSED */
  #if NeedFunctionPrototypes
! Boolean XmtConvertStringToXmString(Display *dpy,
! 				   XrmValue *args, Cardinal *num_args,
! 				   XrmValue *from, XrmValue *to,
! 				   XtPointer *converter_data)
  #else
! Boolean XmtConvertStringToXmString(dpy, args, num_args,
! 				   from, to, converter_data)
! Display *dpy;
! XrmValue *args;
! Cardinal *num_args;
! XrmValue *from;
! XrmValue *to;
! XtPointer *converter_data;
  #endif
  {
!     String s = (String) from->addr;
!     Screen *screen = *(Screen **)args[0].addr;
!     String category, tag;
      String free_me = NULL;
!     XmString value;
  #if NeedFunctionPrototypes
      extern String _XmtLocalize(Screen *, StringConst,StringConst,StringConst);
  #else
      extern String _XmtLocalize();
  #endif
      
      /* if this string has a tag, localize it first */
!     if ((s[0] == '@') && (s[1] == '[')) {
! 	s = XtNewString(s);
  	free_me = s;
  	s += 2;
  	category = NULL;
! 	tag = s;
  	while(*s) {
  	    if (*s == '.' && !category) {
  		*s = '\0';
! 		category = tag;
! 		tag = s+1;
  	    }
! 	    if (*s == ']') {
  		*s = '\0';
  		s++;
  		break;
  	    }
  	    s++;
  	}
  	if (!tag[0]) goto error;
  	if (category && !category[0]) goto error;
! 	s = _XmtLocalize(screen, s, category, tag);
      }
  
      value = XmtCreateXmString(s);
      if (!value) goto error;
      if (free_me) XtFree(free_me);
!     done(XmString, value);
  
   error:
      if (free_me) XtFree(free_me);
!     XtDisplayStringConversionWarning(dpy, (String)from->addr, XmRXmString);
!     return False;
  }
  
  /* ARGSUSED */
  #if NeedFunctionPrototypes
  static void FreeConvertedXmString(XtAppContext app, XrmValue *to,
--- 399,573 ----
  
              t = s+1;
              break;
          }
      }
+     if (s != t) result = appendstring(t, result, False, charset, fixup);
+     
+     XtFree(r);
+ 
+     return result;
+ 
+ #else
+     String r, s, t;
+ #ifdef XMSTRING_TO_COMPOUND_TEXT_BUG
+     String charset = XmSTRING_DEFAULT_CHARSET;
+ #else    
+ #  if XmVersion < 1002
+     String charset = XmSTRING_DEFAULT_CHARSET;
+ #  else
+     String charset = XmFONTLIST_DEFAULT_TAG;
+ #  endif
+ #endif    
+     char charset_buf[3];
+     XmString result = NULL;
+     Boolean fixup = False;
+     
+     if (!str) return NULL;
+     else if (!*str)
+         return XmStringSegmentCreate((String)str, charset,
+                                      XmSTRING_DIRECTION_L_TO_R, False);
+     /*
+      * make a copy of the string so we can frob with it
+      * We keep pointer r so we can free it when done
+      */
+     r = s = XtNewString(str);
+ 
+ 
+     for(t = s; *s; s++) {
+         switch(*s) {
+         case '\n':
+             *s = '\0';  /* null terminate the string */
+             result = appendstring(t, result, True, charset, fixup);
+             fixup = False;
+             t = s+1;
+             break;
+         case '@':
+             if ((*s == '@') && (*(s+1) == '@')) {
+                 /* set a flag to strip doubled escapes later */
+                 fixup = True;
+                 s++;
+                 break;
+             }
+             else if (*(s+1) != 'f') break;
+             /* its a font change, so add the string up to here, if any */
+             *s = '\0'; /* null terminate the string */
+             if (s != t)
+                 result = appendstring(t, result, False, charset, fixup);
+             fixup = False;
  
+             /* and now get the new charset */
+             if (*(s+2) == '\0') break;
+             s+=2;
+             if (*s == '[') {  /* read till close ']' */
+                 s = charset = s+1;
+                 while (*s && (*s != ']')) s++;
+                 if (*s == '\0') break;
+                 *s = '\0';  /* null-terminate the charset string */
+             }
+             else if (*s == '(') { /* charset is next 2 chars */
+                 if (*(s+1)) s++; else break;
+                 charset_buf[0] = *s;
+                 if (*(s+1)) s++; else break;
+                 charset_buf[1] = *s;
+                 charset_buf[2] = '\0';
+                 charset = charset_buf;
+             }
+             else if (*s) { /* charset is single current character */
+                 charset_buf[0] = *s;
+                 charset_buf[1] = '\0';
+                 charset = charset_buf;
+             }
+ 
+             t = s+1;
+             break;
+         }
+     }
      if (s != t) result = appendstring(t, result, False, charset, fixup);
      
      XtFree(r);
+ 
      return result;
+ #endif    
+ /*     return XmStringCreateLocalized(str); */
  }
  
  #endif /* XmVersion >= 2000 */
  
  /* ARGSUSED */
  #if NeedFunctionPrototypes
! static XmString XmtCreateLocalizedXmString_(Screen *screen, StringConst str)
  #else
! static XmString XmtCreateLocalizedXmString_(screen, str)
! Screen* screen;
! StringConst str;
  #endif
  {
!     XmString value = NULL;
!     String category, tag, defaultstr;
      String free_me = NULL;
!     String s = NULL;
  #if NeedFunctionPrototypes
      extern String _XmtLocalize(Screen *, StringConst,StringConst,StringConst);
  #else
      extern String _XmtLocalize();
  #endif
  
+     if (!str)
+         return NULL;
+ 
+ /* printf("==> '%s'\n", str); */
      /* if this string has a tag, localize it first */
!     if ((str[0] == '@') && (str[1] == '{')) {
!         s = XtNewString(str);
          free_me = s;
          s += 2;
+ /* printf("=-> '%s'\n", s); */
          category = NULL;
!         tag = NULL;
!         defaultstr = s;
          while(*s) {
              if (*s == '.' && !category) {
                  *s = '\0';
!                 category = defaultstr;
!                 defaultstr = s+1;
              }
!             if (*s == '.' && !tag) {
!                 *s = '\0';
!                 tag = defaultstr;
!                 defaultstr = s+1;
!             }
!             if (*s == '}') {
                  *s = '\0';
                  s++;
                  break;
              }
              s++;
+ /* printf("-=> '%s'\n", free_me+2); */
          }
+         if (!tag)
+            tag = defaultstr;
          if (!tag[0]) goto error;
          if (category && !category[0]) goto error;
!         s = _XmtLocalize(screen, defaultstr, category, tag);
!     }
!     else {
!         s = (String)str;
      }
  
+ /* printf("--> '%s'\n", s); */
+ 
      value = XmtCreateXmString(s);
+ 
      if (!value) goto error;
      if (free_me) XtFree(free_me);
! 
!     return value;
  
   error:
      if (free_me) XtFree(free_me);
!     return NULL;
  }
  
  /* ARGSUSED */
  #if NeedFunctionPrototypes
  static void FreeConvertedXmString(XtAppContext app, XrmValue *to,
*************** Cardinal *num_args;
*** 433,442 ****
--- 583,637 ----
  #endif
  {
      XmStringFree(*((XmString *) to->addr));
  }
  
+ 
+ 
+ 
+ /* ARGSUSED */
+ #if NeedFunctionPrototypes
+ Boolean XmtConvertStringToXmString(Display *dpy,
+                                    XrmValue *args, Cardinal *num_args,
+                                    XrmValue *from, XrmValue *to,
+                                    XtPointer *converter_data)
+ #else
+ Boolean XmtConvertStringToXmString(dpy, args, num_args,
+                                    from, to, converter_data)
+ Display *dpy;
+ XrmValue *args;
+ Cardinal *num_args;
+ XrmValue *from;
+ XrmValue *to;
+ XtPointer *converter_data;
+ #endif
+ {
+     String s = (String) from->addr;
+     Screen *screen = *(Screen **)args[0].addr;
+     XmString value;
+     
+     value = XmtCreateLocalizedXmString_(screen, s);
+     if (!value) goto error;
+     done(XmString, value);
+ 
+  error:
+     XtDisplayStringConversionWarning(dpy, (String)from->addr, XmRXmString);
+     return False;
+ }
+ 
+ /* ARGSUSED */
+ #if NeedFunctionPrototypes
+ XmString XmtCreateLocalizedXmString(Widget w, StringConst s)
+ #else
+ XmString XmtCreateLocalizedXmString(w, s)
+ Widget w;
+ StringConst s;
+ #endif
+ {
+    return XmtCreateLocalizedXmString_(XtScreen(w), s);
+ }
+ 
  #if NeedFunctionPrototypes
  void XmtRegisterXmStringConverter(void)
  #else
  void XmtRegisterXmStringConverter()
  #endif
diff -bpcBNC 5 Xmt310/Xmt/XmStringCvt.c.xmt310orig Xmt310.ge/Xmt/XmStringCvt.c.xmt310orig
*** Xmt310/Xmt/XmStringCvt.c.xmt310orig	Thu Jan  1 01:00:00 1970
--- Xmt310.ge/Xmt/XmStringCvt.c.xmt310orig	Tue Jun 12 18:11:36 2001
***************
*** 0 ****
--- 1,455 ----
+ /* 
+  * Motif Tools Library, Version 3.1
+  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
+  * 
+  * Written by David Flanagan.
+  * Copyright (c) 1992-2001 by David Flanagan.
+  * All Rights Reserved.  See the file COPYRIGHT for details.
+  * This is open source software.  See the file LICENSE for details.
+  * There is no warranty for this software.  See NO_WARRANTY for details.
+  *
+  * $Log: patch.xmt310,v $
+  * Revision 1.1.1.1  2001/07/18 11:06:01  root
+  * Initial checkin.
+  *
+  * Revision 1.1  2001/06/21 17:47:46  andre
+  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
+  *                  kerberos compilation support
+  *
+  *
+  */
+ 
+ #include <Xmt/Xmt.h>
+ #include <Xmt/ConvertersP.h>
+ 
+ #if XmVersion >= 2000
+ /**
+  * Gary Merrill figured out how XmString parsing works in Motif 2.0, and
+  * how rendition tables and tabs are handled, and wrote this code for
+  * Motif 2.0.  David Flanagan tweaked the resulting code a bit.
+  *
+  * The following escape sequences are supported for strings in the
+  * resource files:
+  *
+  *	    @t		   tab (relative to a tab list)
+  *	    @f[tag]	   font
+  *	    @b[tag]	   begin rendition
+  *	    @e[tag]	   end rendition
+  *	    
+  * Keep in mind that renditions override font specifications.
+  *
+  **/
+ 
+ #if NeedFunctionPrototypes
+ static XmIncludeStatus XmtConvertStringEscape(XtPointer *text,
+ 					      XtPointer text_end,
+ 					      XmTextType type,
+ 					      XmStringTag string_tag,
+ 					      XmParseMapping entry,
+ 					      int pattern_length,
+ 					      XmString *str_include,
+ 					      XtPointer call_data)
+ #else
+ static XmIncludeStatus XmtConvertStringEscape(text, text_end, type, string_tag,
+ 					      entry, pattern_length,
+ 					      str_include, call_data)
+ XtPointer *text;
+ XtPointer text_end;
+ XmTextType type;
+ XmStringTag string_tag;
+ XmParseMapping entry;
+ int pattern_length;
+ XmString *str_include;
+ XtPointer call_data;
+ #endif
+ {
+     char *s, *start, *text_ptr, indicator, *tag, tag_buf[3];
+     XmStringComponentType component_type;
+ 
+     text_ptr = (char *) *text;
+     start = s = XtNewString(*text);
+     
+     /* s[0] should be '@'.  Bump pointer to following char */
+     s++;
+     
+     if (*s == '@') { /* Sequence is '@@' */
+ 	*str_include = XmStringComponentCreate(XmSTRING_COMPONENT_TEXT, 1, s);
+ 	text_ptr +=2;
+ 	*text = text_ptr;
+ 	XtFree(start);
+ 	return XmINSERT;
+     }
+ 
+    switch (*s) {
+    case 't':
+        component_type = XmSTRING_COMPONENT_TAB;
+        break;
+    case 'f':  
+        /*
+ 	* treat @f the same as an unterminated @b.
+ 	* Using XmSTRING_COMPONENT_TAG doesn't work quite right
+ 	* with Motif 2.0.0, so we do it this way, which seems
+ 	* to make as much sense, anyway.
+ 	*/
+    case 'b':
+        component_type = XmSTRING_COMPONENT_RENDITION_BEGIN;
+        break;
+    case 'e':
+        component_type = XmSTRING_COMPONENT_RENDITION_END;
+        break;
+    default:
+        component_type = XmSTRING_COMPONENT_UNKNOWN;
+        break;
+    }
+ 
+    indicator = *s;
+ 
+    switch (component_type) {
+ 
+    case XmSTRING_COMPONENT_UNKNOWN:
+        if ( indicator == '[' )
+ 	   XmtWarningMsg("XmtCreateXmString", "badlocale",
+ 			 "'@[' locale indicator may occur only at beginning of string.");
+        
+        XmtWarningMsg("XmtCreateXmString", "unrecognized",
+ 		     "Unrecognized string escape sequence '@%c' will be treated as text.",
+ 		     indicator);
+        s++;
+        
+        *str_include = XmStringComponentCreate(XmSTRING_COMPONENT_TEXT,
+ 					      2, start);
+        text_ptr += 2;
+        *text = text_ptr;
+        XtFree(start);
+        return XmINSERT;
+        break;
+        
+    case XmSTRING_COMPONENT_TAB:
+        *str_include = XmStringComponentCreate(component_type, 0, NULL);
+        s++;
+        text_ptr += s - start;
+        *text = text_ptr;
+        XtFree(start);
+        return XmINSERT;
+        break;
+        
+    default:	/* just drop through */
+        break;
+    }
+     
+     s++;	 /* go past the component_type character */
+     
+     if (*s == '\0') {
+ 	XmtWarningMsg("XmtCreateXmString", "syntax1",
+ 		      "Improper '@%c' syntax in string being converted.",
+ 		      indicator);
+ 	XtFree(start);
+ 	return XmTERMINATE;
+     }
+     
+     /*
+      * Now get the tag in '[ ]', after '(', or immediately
+      * after the component_type indicator.
+      */
+     switch (*s) {
+     case '[':
+ 	s = tag = s+1;
+ 	while (*s && (*s != ']')) s++;
+ 	if (*s == '\0') {
+ 	    XmtWarningMsg("XmtCreateXmString", "syntax3",
+ 			  "'@%c[%s' is missing ']' in string being converted",
+ 			  indicator, tag);
+ 	    break;
+ 	}
+ 	*s = '\0'; /* null terminate the tag string */
+ 	s++;
+ 	break;
+ 	
+     case '(':
+ 	if (!*(s+1) || !*(s+2)) {
+ 	    XmtWarningMsg("XmtCreateXmString", "syntax2",
+ 			"Improper '@%c(' syntax in string being converted.",
+ 			indicator);
+ 	    XtFree(start);
+ 	    return XmTERMINATE;
+ 	}
+ 	tag_buf[0] = *(s+1);
+ 	tag_buf[1] = *(s+2);
+ 	tag_buf[2] = '\0';
+ 	tag = tag_buf;
+ 	s += 3;
+ 	break;
+ 	
+     default:
+ 	tag_buf[0] = *s;
+ 	tag_buf[1] = '\0';
+ 	s++;
+ 	tag = tag_buf;
+ 	break;
+     }
+     
+     *str_include = XmStringComponentCreate(component_type, strlen(tag), tag);
+     text_ptr += s - start;
+     *text = text_ptr;
+     
+     XtFree(start);
+     return XmINSERT;
+ }
+ 
+ 
+ #if NeedFunctionPrototypes
+ XmString XmtCreateXmString(StringConst str)
+ #else
+ XmString XmtCreateXmString(str)
+ StringConst str;
+ #endif
+ {
+     static Boolean parse_table_registered = False;
+     static XmParseMapping parse_table[3];
+     
+     if (!parse_table_registered) {
+ 	Arg args[3];
+ 	int n;
+ 	
+ 	n = 0;
+ 	XtSetArg(args[n], XmNpattern, "\n"); n++;
+ 	XtSetArg(args[n], XmNincludeStatus, XmINSERT); n++;
+ 	XtSetArg(args[n], XmNsubstitute,XmStringSeparatorCreate());n++;
+ 	parse_table[0] = XmParseMappingCreate(args, n);
+ 	
+ 	n = 0;
+ 	XtSetArg(args[n], XmNpattern, "\t"); n++;
+ 	XtSetArg(args[n], XmNincludeStatus, XmINSERT); n++;
+ 	XtSetArg(args[n], XmNsubstitute,
+ 		 XmStringComponentCreate(XmSTRING_COMPONENT_TAB, 0,NULL)); n++;
+ 	parse_table[1] = XmParseMappingCreate(args, n);
+ 	
+ 	n = 0;
+ 	XtSetArg(args[n], XmNpattern, "@"); n++;
+ 	XtSetArg(args[n], XmNincludeStatus, XmINVOKE); n++;
+ 	XtSetArg(args[n], XmNinvokeParseProc, XmtConvertStringEscape); n++;
+ 	parse_table[2] = XmParseMappingCreate(args, n);
+ 	
+ 	parse_table_registered = True;
+     }
+     
+     return XmStringParseText((XtPointer) str, NULL, NULL, XmCHARSET_TEXT,
+ 			     parse_table, XtNumber(parse_table),
+ 			     NULL);
+ }
+ 
+ #else  /* XmVersion < 2000 */
+ 
+ #if NeedFunctionPrototypes
+ static XmString appendstring(String txt, XmString to, int sep, char *charset,
+ 			     int fixup)
+ #else
+ static XmString appendstring(txt, to, sep, charset, fixup)
+ String txt;
+ XmString to;
+ int sep;
+ char *charset;
+ int fixup;
+ #endif
+ {
+     XmString s1, s2;
+     char *s, *t;
+ 
+     if (fixup) {
+ 	for(s=t=txt; *s; s++, t++) {
+ 	    *t = *s;
+ 	    if ((*s == '@') && (*(s+1) == '@'))	s++;
+ 	}
+ 	*t = *s;  /* copy the terminating '\0' */
+     }
+ 
+     s1 = XmStringSegmentCreate(txt, charset, XmSTRING_DIRECTION_L_TO_R, sep);
+     if (!to) return s1;
+     s2 = XmStringConcat(to, s1);
+     XmStringFree(to);
+     XmStringFree(s1);
+     return s2;
+ }
+ 
+ #if NeedFunctionPrototypes
+ XmString XmtCreateXmString(StringConst str)
+ #else
+ XmString XmtCreateXmString(str)
+ StringConst str;
+ #endif
+ {
+     String r, s, t;
+ #ifdef XMSTRING_TO_COMPOUND_TEXT_BUG
+     String charset = XmSTRING_DEFAULT_CHARSET;
+ #else	 
+ #  if XmVersion < 1002
+     String charset = XmSTRING_DEFAULT_CHARSET;
+ #  else
+     String charset = XmFONTLIST_DEFAULT_TAG;
+ #  endif
+ #endif	  
+     char charset_buf[3];
+     XmString result = NULL;
+     Boolean fixup = False;
+     
+     if (!str) return NULL;
+     else if (!*str)
+ 	return XmStringSegmentCreate((String)str, charset,
+ 				     XmSTRING_DIRECTION_L_TO_R, False);
+ 
+     /*
+      * make a copy of the string so we can frob with it
+      * We keep pointer r so we can free it when done
+      */
+     r = s = XtNewString(str);
+ 
+     for(t = s; *s; s++) {
+ 	switch(*s) {
+ 	case '\n':
+ 	    *s = '\0';	/* null terminate the string */
+ 	    result = appendstring(t, result, True, charset, fixup);
+ 	    fixup = False;
+ 	    t = s+1;
+ 	    break;
+ 	case '@':
+ 	    if ((*s == '@') && (*(s+1) == '@')) {
+ 		/* set a flag to strip doubled escapes later */
+ 		fixup = True;
+ 		s++;
+ 		break;
+ 	    }
+ 	    else if (*(s+1) != 'f') break;
+ 	    /* its a font change, so add the string up to here, if any */
+ 	    *s = '\0'; /* null terminate the string */
+ 	    if (s != t)
+ 		result = appendstring(t, result, False, charset, fixup);
+ 	    fixup = False;
+ 
+ 	    /* and now get the new charset */
+ 	    if (*(s+2) == '\0') break;
+ 	    s+=2;
+ 	    if (*s == '[') {  /* read till close ']' */
+ 		s = charset = s+1;
+ 		while (*s && (*s != ']')) s++;
+ 		if (*s == '\0') break;
+ 		*s = '\0';  /* null-terminate the charset string */
+ 	    }
+ 	    else if (*s == '(') { /* charset is next 2 chars */
+ 		if (*(s+1)) s++; else break;
+ 		charset_buf[0] = *s;
+ 		if (*(s+1)) s++; else break;
+ 		charset_buf[1] = *s;
+ 		charset_buf[2] = '\0';
+ 		charset = charset_buf;
+ 	    }
+ 	    else if (*s) { /* charset is single current character */
+ 		charset_buf[0] = *s;
+ 		charset_buf[1] = '\0';
+ 		charset = charset_buf;
+ 	    }
+ 
+ 	    t = s+1;
+ 	    break;
+ 	}
+     }
+ 
+     if (s != t) result = appendstring(t, result, False, charset, fixup);
+     
+     XtFree(r);
+     return result;
+ }
+ 
+ #endif /* XmVersion >= 2000 */
+ 
+ /* ARGSUSED */
+ #if NeedFunctionPrototypes
+ Boolean XmtConvertStringToXmString(Display *dpy,
+ 				   XrmValue *args, Cardinal *num_args,
+ 				   XrmValue *from, XrmValue *to,
+ 				   XtPointer *converter_data)
+ #else
+ Boolean XmtConvertStringToXmString(dpy, args, num_args,
+ 				   from, to, converter_data)
+ Display *dpy;
+ XrmValue *args;
+ Cardinal *num_args;
+ XrmValue *from;
+ XrmValue *to;
+ XtPointer *converter_data;
+ #endif
+ {
+     String s = (String) from->addr;
+     Screen *screen = *(Screen **)args[0].addr;
+     String category, tag;
+     String free_me = NULL;
+     XmString value;
+ #if NeedFunctionPrototypes
+     extern String _XmtLocalize(Screen *, StringConst,StringConst,StringConst);
+ #else
+     extern String _XmtLocalize();
+ #endif
+     
+     /* if this string has a tag, localize it first */
+     if ((s[0] == '@') && (s[1] == '[')) {
+ 	s = XtNewString(s);
+ 	free_me = s;
+ 	s += 2;
+ 	category = NULL;
+ 	tag = s;
+ 	while(*s) {
+ 	    if (*s == '.' && !category) {
+ 		*s = '\0';
+ 		category = tag;
+ 		tag = s+1;
+ 	    }
+ 	    if (*s == ']') {
+ 		*s = '\0';
+ 		s++;
+ 		break;
+ 	    }
+ 	    s++;
+ 	}
+ 	if (!tag[0]) goto error;
+ 	if (category && !category[0]) goto error;
+ 	s = _XmtLocalize(screen, s, category, tag);
+     }
+ 
+     value = XmtCreateXmString(s);
+     if (!value) goto error;
+     if (free_me) XtFree(free_me);
+     done(XmString, value);
+ 
+  error:
+     if (free_me) XtFree(free_me);
+     XtDisplayStringConversionWarning(dpy, (String)from->addr, XmRXmString);
+     return False;
+ }
+ 
+ /* ARGSUSED */
+ #if NeedFunctionPrototypes
+ static void FreeConvertedXmString(XtAppContext app, XrmValue *to,
+ 				  XtPointer closure,
+ 				  XrmValue *args, Cardinal *num_args)
+ #else
+ static void FreeConvertedXmString(app, to, closure, args, num_args)
+ XtAppContext app;
+ XrmValue *to;
+ XtPointer closure;
+ XrmValue *args;
+ Cardinal *num_args;
+ #endif
+ {
+     XmStringFree(*((XmString *) to->addr));
+ }
+ 
+ #if NeedFunctionPrototypes
+ void XmtRegisterXmStringConverter(void)
+ #else
+ void XmtRegisterXmStringConverter()
+ #endif
+ {
+     static Boolean registered = False;
+ 
+     if (!registered) {
+ 	XtSetTypeConverter(XtRString, XmRXmString,
+ 			   XmtConvertStringToXmString,
+ 			   (XtConvertArgRec *)screenConvertArg, (Cardinal) 1,
+ 			   XtCacheAll | XtCacheRefCount,
+ 			   FreeConvertedXmString);
+ 	registered = True;
+     }
+ }
+ 
diff -bpcBNC 5 Xmt310/Xmt/XmText.c Xmt310.ge/Xmt/XmText.c
*** Xmt310/Xmt/XmText.c	Sun Feb  4 22:49:10 2001
--- Xmt310.ge/Xmt/XmText.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
diff -bpcBNC 5 Xmt310/Xmt/XmTextField.c Xmt310.ge/Xmt/XmTextField.c
*** Xmt310/Xmt/XmTextField.c	Sun Feb  4 22:49:12 2001
--- Xmt310.ge/Xmt/XmTextField.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
diff -bpcBNC 5 Xmt310/Xmt/XmToggleB.c Xmt310.ge/Xmt/XmToggleB.c
*** Xmt310/Xmt/XmToggleB.c	Sun Feb  4 22:49:16 2001
--- Xmt310.ge/Xmt/XmToggleB.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
diff -bpcBNC 5 Xmt310/Xmt/Xmt.h Xmt310.ge/Xmt/Xmt.h
*** Xmt310/Xmt/Xmt.h	Sun Feb  4 22:49:20 2001
--- Xmt310.ge/Xmt/Xmt.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _Xmt_h
  #define _Xmt_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _Xmt_h
  #define _Xmt_h
diff -bpcBNC 5 Xmt310/Xmt/XmtP.h Xmt310.ge/Xmt/XmtP.h
*** Xmt310/Xmt/XmtP.h	Sun Feb  4 22:49:28 2001
--- Xmt310.ge/Xmt/XmtP.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #ifndef _XmtP_h
  #define _XmtP_h
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #ifndef _XmtP_h
  #define _XmtP_h
diff -bpcBNC 5 Xmt310/Xmt/XmtProcs.c Xmt310.ge/Xmt/XmtProcs.c
*** Xmt310/Xmt/XmtProcs.c	Sun Feb  4 22:49:36 2001
--- Xmt310.ge/Xmt/XmtProcs.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/Xmt.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/Xmt.h>
diff -bpcBNC 5 Xmt310/Xmt/XmtWidgets.c Xmt310.ge/Xmt/XmtWidgets.c
*** Xmt310/Xmt/XmtWidgets.c	Sun Feb  4 22:49:38 2001
--- Xmt310.ge/Xmt/XmtWidgets.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <Xmt/Xmt.h>
  #include <Xmt/WidgetType.h>
diff -bpcBNC 5 Xmt310/Xmt/Xpm.c Xmt310.ge/Xmt/Xpm.c
*** Xmt310/Xmt/Xpm.c	Sun Feb  4 22:49:42 2001
--- Xmt310.ge/Xmt/Xpm.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * This file is derived in part from the XPM 3.0 distribution by
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  /*
   * This file is derived in part from the XPM 3.0 distribution by
diff -bpcBNC 5 Xmt310/Xmt/Xpm.h Xmt310.ge/Xmt/Xpm.h
*** Xmt310/Xmt/Xpm.h	Sun Feb  4 22:49:44 2001
--- Xmt310.ge/Xmt/Xpm.h	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * This file is derived in part from the XPM 3.0 distribution by
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  /*
   * This file is derived in part from the XPM 3.0 distribution by
diff -bpcBNC 5 Xmt310/Xmt/XpmParse.c Xmt310.ge/Xmt/XpmParse.c
*** Xmt310/Xmt/XpmParse.c	Sun Feb  4 22:49:50 2001
--- Xmt310.ge/Xmt/XpmParse.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  /*
   * This file is derived in part from the XPM 3.0 distribution by
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  /*
   * This file is derived in part from the XPM 3.0 distribution by
*************** typedef struct {
*** 84,97 ****
      char *Eoa;				/* string ending assignment */
  } LexerTypeData;
  
  static LexerTypeData lexer_types[] =
  {
!  "", '\0', '\n', "", "", "", "",	/* Natural type */
!  "C", '"', '"', ",\n", "static char *", "[] = {\n", "};\n",
!  "Lisp", '"', '"', "\n", "(setq ", " '(\n", "))\n",
!  NULL, 0, 0, NULL, NULL, NULL, NULL
  };
  
  /*
   * these strings come directly before the optional default color string
   * for each of the visuals.  The string "s" comes before the optional
--- 87,100 ----
      char *Eoa;				/* string ending assignment */
  } LexerTypeData;
  
  static LexerTypeData lexer_types[] =
  {
!  {"", '\0', '\n', "", "", "", ""},	/* Natural type */
!  {"C", '"', '"', ",\n", "static char *", "[] = {\n", "};\n"},
!  {"Lisp", '"', '"', "\n", "(setq ", " '(\n", "))\n"},
!  {NULL, 0, 0, NULL, NULL, NULL, NULL}
  };
  
  /*
   * these strings come directly before the optional default color string
   * for each of the visuals.  The string "s" comes before the optional
diff -bpcBNC 5 Xmt310/Xmt/XtProcs.c Xmt310.ge/Xmt/XtProcs.c
*** Xmt310/Xmt/XtProcs.c	Sun Feb  4 22:57:02 2001
--- Xmt310.ge/Xmt/XtProcs.c	Tue Jun 12 18:25:28 2001
***************
*** 1,16 ****
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/Xmt.h>
--- 1,19 ----
  /* 
   * Motif Tools Library, Version 3.1
!  * $Id: patch.xmt310,v 1.1.1.1 2001/07/18 11:06:01 root Exp $
   * 
   * Written by David Flanagan.
   * Copyright (c) 1992-2001 by David Flanagan.
   * All Rights Reserved.  See the file COPYRIGHT for details.
   * This is open source software.  See the file LICENSE for details.
   * There is no warranty for this software.  See NO_WARRANTY for details.
   *
!  * $Log: patch.xmt310,v $
!  * Revision 1.1.1.1  2001/07/18 11:06:01  root
!  * Initial checkin.
!  *
!  * Revision 1.1  2001/06/21 17:47:46  andre
!  * AA-2001-06-21-1: reserved port security, change of sge_gdi_request changes,
!  *                  kerberos compilation support
!  *
!  * Revision 1.2  2001/06/12 16:25:28  andre
!  * *** empty log message ***
!  *
   *
   */
  
  #include <stdio.h>
  #include <Xmt/Xmt.h>
