[Motiftools-xmt-cvs] CVS: xmt/Xmt ExtWidgets.h,1.6,1.7 ExtLabelS.c,1.5,1.6

[Grant M. <grm...@us...>]

Update of /cvsroot/motiftools/xmt/Xmt
In directory sc8-pr-cvs1:/tmp/cvs-serv8912

Modified Files:
	ExtWidgets.h ExtLabelS.c 
Log Message:
Move strings to keep binary compatibility

Index: ExtWidgets.h
===================================================================
RCS file: /cvsroot/motiftools/xmt/Xmt/ExtWidgets.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ExtWidgets.h	14 Aug 2003 02:17:24 -0000	1.6
--- ExtWidgets.h	27 Oct 2003 20:18:59 -0000	1.7
***************
*** 10,13 ****
--- 10,16 ----
    *
    * $Log$
+   * Revision 1.7  2003/10/27 20:18:59  grmcdorman
+   * Move strings to keep binary compatibility
+   *
    * Revision 1.6  2003/08/14 02:17:24  grmcdorman
    * New XmtExtLabelSetPixmap function
***************
*** 61,64 ****
--- 64,69 ----
  
  /*
+  * WARNING: Add names at the end of the list to maintain binary compatiblity.
+  *
   * List of resource names:
   * XmtNarmMask
***************
*** 81,85 ****
   * XmtNselectPixmapMask
   * XmtNshadowType
-  * XmtNshape
   * XmtNshowBoth
   * XmtNspacing
--- 86,89 ----
***************
*** 95,99 ****
   * XmtCPosition
   * XmtCShadowType
-  * XmtCShape
   * XmtCShowBoth
   * XmtCSpacing
--- 99,102 ----
***************
*** 109,112 ****
--- 112,120 ----
   * XmtRVerticalAlignment
   *
+  * New names below:
+  * XmtNshape
+  * XmtCShape
+  *
+  *
   * Run this file through this awk script:
   *  BEGIN { cnt = 0; }
***************
*** 129,132 ****
--- 137,141 ----
   * to get the body of the ExtLabelS.c file.
   */
+ 
  #ifndef XmtNarmMask
  #define XmtNarmMask ((char*)&XmtExtLabelStrings[0])
***************
*** 186,263 ****
  #define XmtNshadowType ((char*)&XmtExtLabelStrings[300])
  #endif
- #ifndef XmtNshape
- #define XmtNshape ((char*)&XmtExtLabelStrings[311])
- #endif
  #ifndef XmtNshowBoth
! #define XmtNshowBoth ((char*)&XmtExtLabelStrings[317])
  #endif
  #ifndef XmtNspacing
! #define XmtNspacing ((char*)&XmtExtLabelStrings[326])
  #endif
  #ifndef XmtNtoggleMode
! #define XmtNtoggleMode ((char*)&XmtExtLabelStrings[334])
  #endif
  #ifndef XmtNverticalAlignment
! #define XmtNverticalAlignment ((char*)&XmtExtLabelStrings[345])
  #endif
  #ifndef XmtCAlignment
! #define XmtCAlignment ((char*)&XmtExtLabelStrings[363])
  #endif
  #ifndef XmtCDetailShadowThickness
! #define XmtCDetailShadowThickness ((char*)&XmtExtLabelStrings[373])
  #endif
  #ifndef XmtCIndeterminatePixmap
! #define XmtCIndeterminatePixmap ((char*)&XmtExtLabelStrings[395])
  #endif
  #ifndef XmtCMargin
! #define XmtCMargin ((char*)&XmtExtLabelStrings[415])
  #endif
  #ifndef XmtCMask
! #define XmtCMask ((char*)&XmtExtLabelStrings[422])
  #endif
  #ifndef XmtCMotifBugs
! #define XmtCMotifBugs ((char*)&XmtExtLabelStrings[427])
  #endif
  #ifndef XmtCPosition
! #define XmtCPosition ((char*)&XmtExtLabelStrings[437])
  #endif
  #ifndef XmtCShadowType
! #define XmtCShadowType ((char*)&XmtExtLabelStrings[446])
! #endif
! #ifndef XmtCShape
! #define XmtCShape ((char*)&XmtExtLabelStrings[457])
  #endif
  #ifndef XmtCShowBoth
! #define XmtCShowBoth ((char*)&XmtExtLabelStrings[463])
  #endif
  #ifndef XmtCSpacing
! #define XmtCSpacing ((char*)&XmtExtLabelStrings[472])
  #endif
  #ifndef XmtCStyle
! #define XmtCStyle ((char*)&XmtExtLabelStrings[480])
  #endif
  #ifndef XmtRAlignment
! #define XmtRAlignment ((char*)&XmtExtLabelStrings[486])
  #endif
  #ifndef XmtRBoolean
! #define XmtRBoolean ((char*)&XmtExtLabelStrings[496])
  #endif
  #ifndef XmtRDimension
! #define XmtRDimension ((char*)&XmtExtLabelStrings[504])
  #endif
  #ifndef XmtRBitmask
! #define XmtRBitmask ((char*)&XmtExtLabelStrings[514])
  #endif
  #ifndef XmtRExtLabelPosition
! #define XmtRExtLabelPosition ((char*)&XmtExtLabelStrings[522])
  #endif
  #ifndef XmtRInsensitiveStyle
! #define XmtRInsensitiveStyle ((char*)&XmtExtLabelStrings[539])
  #endif
  #ifndef XmtRShadowType
! #define XmtRShadowType ((char*)&XmtExtLabelStrings[556])
  #endif
  #ifndef XmtRVerticalAlignment
! #define XmtRVerticalAlignment ((char*)&XmtExtLabelStrings[567])
  #endif
  
--- 195,272 ----
  #define XmtNshadowType ((char*)&XmtExtLabelStrings[300])
  #endif
  #ifndef XmtNshowBoth
! #define XmtNshowBoth ((char*)&XmtExtLabelStrings[311])
  #endif
  #ifndef XmtNspacing
! #define XmtNspacing ((char*)&XmtExtLabelStrings[320])
  #endif
  #ifndef XmtNtoggleMode
! #define XmtNtoggleMode ((char*)&XmtExtLabelStrings[328])
  #endif
  #ifndef XmtNverticalAlignment
! #define XmtNverticalAlignment ((char*)&XmtExtLabelStrings[339])
  #endif
  #ifndef XmtCAlignment
! #define XmtCAlignment ((char*)&XmtExtLabelStrings[357])
  #endif
  #ifndef XmtCDetailShadowThickness
! #define XmtCDetailShadowThickness ((char*)&XmtExtLabelStrings[367])
  #endif
  #ifndef XmtCIndeterminatePixmap
! #define XmtCIndeterminatePixmap ((char*)&XmtExtLabelStrings[389])
  #endif
  #ifndef XmtCMargin
! #define XmtCMargin ((char*)&XmtExtLabelStrings[409])
  #endif
  #ifndef XmtCMask
! #define XmtCMask ((char*)&XmtExtLabelStrings[416])
  #endif
  #ifndef XmtCMotifBugs
! #define XmtCMotifBugs ((char*)&XmtExtLabelStrings[421])
  #endif
  #ifndef XmtCPosition
! #define XmtCPosition ((char*)&XmtExtLabelStrings[431])
  #endif
  #ifndef XmtCShadowType
! #define XmtCShadowType ((char*)&XmtExtLabelStrings[440])
  #endif
  #ifndef XmtCShowBoth
! #define XmtCShowBoth ((char*)&XmtExtLabelStrings[451])
  #endif
  #ifndef XmtCSpacing
! #define XmtCSpacing ((char*)&XmtExtLabelStrings[460])
  #endif
  #ifndef XmtCStyle
! #define XmtCStyle ((char*)&XmtExtLabelStrings[468])
  #endif
  #ifndef XmtRAlignment
! #define XmtRAlignment ((char*)&XmtExtLabelStrings[474])
  #endif
  #ifndef XmtRBoolean
! #define XmtRBoolean ((char*)&XmtExtLabelStrings[484])
  #endif
  #ifndef XmtRDimension
! #define XmtRDimension ((char*)&XmtExtLabelStrings[492])
  #endif
  #ifndef XmtRBitmask
! #define XmtRBitmask ((char*)&XmtExtLabelStrings[502])
  #endif
  #ifndef XmtRExtLabelPosition
! #define XmtRExtLabelPosition ((char*)&XmtExtLabelStrings[510])
  #endif
  #ifndef XmtRInsensitiveStyle
! #define XmtRInsensitiveStyle ((char*)&XmtExtLabelStrings[527])
  #endif
  #ifndef XmtRShadowType
! #define XmtRShadowType ((char*)&XmtExtLabelStrings[544])
  #endif
  #ifndef XmtRVerticalAlignment
! #define XmtRVerticalAlignment ((char*)&XmtExtLabelStrings[555])
! #endif
! #ifndef XmtNshape
! #define XmtNshape ((char*)&XmtExtLabelStrings[573])
! #endif
! #ifndef XmtCShape
! #define XmtCShape ((char*)&XmtExtLabelStrings[579])
  #endif
  

Index: ExtLabelS.c
===================================================================
RCS file: /cvsroot/motiftools/xmt/Xmt/ExtLabelS.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ExtLabelS.c	13 Aug 2002 23:38:56 -0000	1.5
--- ExtLabelS.c	27 Oct 2003 20:18:59 -0000	1.6
***************
*** 10,13 ****
--- 10,16 ----
    *
    * $Log$
+   * Revision 1.6  2003/10/27 20:18:59  grmcdorman
+   * Move strings to keep binary compatibility
+   *
    * Revision 1.5  2002/08/13 23:38:56  grmcdorman
    * ExtToggle: bug fix, XmtExtToggleSet state did not work when toggle was insensitive.
***************
*** 69,73 ****
  's','e','l','e','c','t','P','i','x','m','a','p','M','a','s','k', 0,
  's','h','a','d','o','w','T','y','p','e', 0,
- 's','h','a','p','e', 0,
  's','h','o','w','B','o','t','h', 0,
  's','p','a','c','i','n','g', 0,
--- 72,75 ----
***************
*** 82,86 ****
  'P','o','s','i','t','i','o','n', 0,
  'S','h','a','d','o','w','T','y','p','e', 0,
- 'S','h','a','p','e', 0,
  'S','h','o','w','B','o','t','h', 0,
  'S','p','a','c','i','n','g', 0,
--- 84,87 ----
***************
*** 94,96 ****
--- 95,99 ----
  'S','h','a','d','o','w','T','y','p','e', 0,
  'V','e','r','t','i','c','a','l','A','l','i','g','n','m','e','n','t', 0,
+ 's','h','a','p','e', 0,
+ 'S','h','a','p','e', 0,
  };