home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1994 January / usenetsourcesnewsgroupsinfomagicjanuary1994.iso / sources / x / volume3 / xsaver / part02 / toolkit.pat < prev    next >
Encoding:
Text File  |  1989-03-10  |  4.1 KB  |  121 lines
  1. /* Caution:  These are unpublished patches and may not be
  2.  * redistributed.  Anyone installing them should preserve
  3.  * the old version of the files so that the published fix
  4.  * may be installed without error when it becomes available.
  5.  */
  6.  
  7. *** old/lib/Xt/Geometry.c
  8. --- lib/Xt/Geometry.c
  9. ***************
  10. *** 1,5 ****
  11.   #ifndef lint
  12. ! static char Xrcsid[] = "$XConsortium: Geometry.c,v 1.29 88/09/06 16:27:56 jim Exp $";
  13.   /* $oHeader: Geometry.c,v 1.3 88/08/23 11:37:50 asente Exp $ */
  14.   #endif lint
  15.   
  16. --- 1,5 ----
  17.   #ifndef lint
  18. ! static char Xrcsid[] = "$XConsortium: Geometry.c,v 1.32 89/01/18 12:38:04 swick Exp $";
  19.   /* $oHeader: Geometry.c,v 1.3 88/08/23 11:37:50 asente Exp $ */
  20.   #endif lint
  21.   
  22. ***************
  23. *** 48,53 ****
  24. --- 48,54 ----
  25.              "XtMakeGeometryRequest - NULL parent.  Use SetValues instead",
  26.               (String *)NULL, (Cardinal *)NULL); 
  27.       }
  28. +     managed = XtIsManaged(widget);
  29.   
  30.       if (XtIsComposite(parent)) {
  31.       parentRealized = XtIsRealized(parent);
  32. ***************
  33. *** 60,76 ****
  34.       manager = ((CompositeObjectClass) (parent->core.widget_class))
  35.               ->composite_class.geometry_manager;
  36.       
  37. !     } else {
  38.       /* Should never happen - XtManageChildren should have checked */
  39.       XtErrorMsg("invalidParent","xtMakeGeometryRequest","XtToolkitError",
  40.                "XtMakeGeometryRequest - parent not composite",
  41.                 (String *)NULL, (Cardinal *)NULL);
  42.       }
  43.   
  44. !     if (manager == (XtGeometryHandler) NULL) {
  45.       XtErrorMsg("invalidGeometryManager","xtMakeGeometryRequest",
  46.                    "XtToolkitError",
  47. !                  "XtMakeGeometryRequest - parent has no geometry manger",
  48.                     (String *)NULL, (Cardinal *)NULL);
  49.       }
  50.   
  51. --- 61,84 ----
  52.       manager = ((CompositeObjectClass) (parent->core.widget_class))
  53.               ->composite_class.geometry_manager;
  54.       
  55. !     } else if (managed) {
  56.       /* Should never happen - XtManageChildren should have checked */
  57.       XtErrorMsg("invalidParent","xtMakeGeometryRequest","XtToolkitError",
  58.                "XtMakeGeometryRequest - parent not composite",
  59.                 (String *)NULL, (Cardinal *)NULL);
  60. +     } else {
  61. +     /* no need to waste time checking if parent is actually realized
  62. +      * at this point; since the child is unmanaged we need to perform
  63. +      * the configure iff the child is realized, so we dummy the
  64. +      * parentRealized checks below.
  65. +      */
  66. +     parentRealized = TRUE;
  67.       }
  68.   
  69. !     if (managed && manager == (XtGeometryHandler) NULL) {
  70.       XtErrorMsg("invalidGeometryManager","xtMakeGeometryRequest",
  71.                    "XtToolkitError",
  72. !                  "XtMakeGeometryRequest - parent has no geometry manager",
  73.                     (String *)NULL, (Cardinal *)NULL);
  74.       }
  75.   
  76. ***************
  77. *** 81,87 ****
  78.       } else {
  79.           widgetRealized = FALSE;
  80.       };
  81. -     managed = XtIsManaged(widget);
  82.   
  83.       /* see if requesting anything to change */
  84.       changeMask = 0;
  85. --- 89,94 ----
  86. *** old/lib/Xt/TMstate.c
  87. --- lib/Xt/TMstate.c
  88. *** /tmp/,RCSt1a02952    Thu Feb 23 11:28:13 1989
  89. --- TMstate.c    Tue Jan 31 15:50:54 1989
  90. ***************
  91. *** 1,5 ****
  92.   #ifndef lint
  93. ! static char Xrcsid[] = "$XConsortium: TMstate.c,v 1.67 89/01/30 15:01:40 swick Exp $";
  94.   /* $oHeader: TMstate.c,v 1.5 88/09/01 17:17:29 asente Exp $ */
  95.   #endif lint
  96.   /*LINTLIBRARY*/
  97. --- 1,5 ----
  98.   #ifndef lint
  99. ! static char Xrcsid[] = "$XConsortium: TMstate.c,v 1.68 89/01/31 15:50:05 swick Exp $";
  100.   /* $oHeader: TMstate.c,v 1.5 88/09/01 17:17:29 asente Exp $ */
  101.   #endif lint
  102.   /*LINTLIBRARY*/
  103. ***************
  104. *** 1114,1120 ****
  105.        unbound != 0 && actionList != NULL;
  106.        actionList = actionList->next) {
  107.       unbound = BindAccActions(widget,stateTable, actionList->table,
  108. !                                 index, (XtBoundAccActions) accBindings);
  109.       }
  110.   /*    if (unbound != 0) ReportUnboundActions(tm, stateTable);*/
  111.       (*accBindings) = accTemp;
  112. --- 1114,1120 ----
  113.        unbound != 0 && actionList != NULL;
  114.        actionList = actionList->next) {
  115.       unbound = BindAccActions(widget,stateTable, actionList->table,
  116. !                                 index, accTemp);
  117.       }
  118.   /*    if (unbound != 0) ReportUnboundActions(tm, stateTable);*/
  119.       (*accBindings) = accTemp;
  120.  
  121.