home *** CD-ROM | disk | FTP | other *** search
/ OS/2 Shareware BBS: 10 Tools / 10-Tools.zip / ibmodf.zip / SIMPLPRT.ZIP / SIMPLPRT.SUP < prev    next >
Text File  |  1995-06-06  |  23KB  |  224 lines
  1. SUPERC2 -- IBM OS/2 PC LINE COMPARE                 06/06/95  10:38  PAGE   1 
  2. NEW FILE =  E:\OPENDOC7\SAMPLES\PARTS\SIMPLPRT\SIMPLPRT.CPP 
  3. OLD FILE =    G:\SMARTPRT\SMARTPRT.CPP 
  4.                      LINE COMPARE SOURCE SECTION 
  5. ID  ----+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8 NEW REF#  CHNG TYPE   OLD REF# 
  6.                                                                        DEL=    1 
  7. D -                                                                                   00001  DELETED(OLD) 00001 
  8.                                                  MATCH=    1 INS=   14 DEL=    3 
  9. I -  *      File:           simplprt.cpp //+(rlt 3-8-95)                              00002  INSERT(NEW)  00003 
  10. I -  *                                                                                00003  INSERT(NEW)  00003 
  11. I -  *   Contains:  IDL description of Container Part                                 00004  INSERT(NEW)  00003 
  12. I -  *                                                                                00005  INSERT(NEW)  00003 
  13. I -  *   Written by:        Jason Crawford                                            00006  INSERT(NEW)  00003 
  14. I -  *                                                                                00007  INSERT(NEW)  00003 
  15. I -  *                                                                                00008  INSERT(NEW)  00003 
  16. I -  *   Change History (most recent first):                                          00009  INSERT(NEW)  00003 
  17. I -  *                                                                                00010  INSERT(NEW)  00003 
  18. I -  *       <3>      3-8-95         rlt    Fixed clips based on Content transformat  00011  INSERT(NEW)  00003 
  19. I -  *       <2>      3-8-95         rlt    Changed Default color                     00012  INSERT(NEW)  00003 
  20. I -  *       <1>      3-8-95         rlt    Added History preamble                    00013  INSERT(NEW)  00003 
  21. I -  *                                                                                00014  INSERT(NEW)  00003 
  22. I -  *                                                                                00015  INSERT(NEW)  00003 
  23. D -  *  This file was generated by the SOM Compiler.                                  00016  DELETED(OLD) 00003 
  24. D -  *  Generated using:                                                              00016  DELETED(OLD) 00004 
  25. D -  *     SOM incremental update: 2.41                                               00016  DELETED(OLD) 00005 
  26.                                                  MATCH=    1           DEL=    2 
  27. D -                                                                                   00017  DELETED(OLD) 00007 
  28. D -                                                                                   00017  DELETED(OLD) 00008 
  29.                                                  MATCH=   41 INS=    2 DEL=    2 
  30. I - #include "SimplPrt.xih"                                                           00058  INSERT(NEW)  00050 
  31. D - #include "SmartPrt.xih"                                                           00059  DELETED(OLD) 00050 
  32. I - #include "PartInfo.hpp"     //mcs aj - we have made PartInfo public               00059  INSERT(NEW)  00051 
  33. D - #include "PartInfo.hpp"                                                           00060  DELETED(OLD) 00051 
  34.                                                  MATCH=   35 INS=    1 DEL=    1 
  35. I - //#if 1 mcs aj                                                                    00095  INSERT(NEW)  00087 
  36. D - //#if 1 mcs                                                                       00096  DELETED(OLD) 00087 
  37.                                                  MATCH=   47 INS=    1 DEL=    1 
  38. I -     static int defcolor = 4; //+ (rlt - 3-8-95)                                   00143  INSERT(NEW)  00135 
  39. D -     static int defcolor = 0;                                                      00144  DELETED(OLD) 00135 
  40.                                                  MATCH=   53           DEL=   24 
  41. D -                                                                                   00197  DELETED(OLD) 00189 
  42. D - /*                                                                                00197  DELETED(OLD) 00190 
  43. D -  * SOM_Scope ODBoolean  SOMLINK SimplePartHandleMouseDownEdgeResize(SimplePart *  00197  DELETED(OLD) 00191 
  44. D -  *                                                                   Environment  00197  DELETED(OLD) 00192 
  45. D -  *                                                                  ODFacet* fac  00197  DELETED(OLD) 00193 
  46. D -  *                                                                  Proxy* selec  00197  DELETED(OLD) 00194 
  47. D -  *                                                                  POINTL* mous  00197  DELETED(OLD) 00195 
  48. D -  */                                                                               00197  DELETED(OLD) 00196 
  49. D -                                                                                   00197  DELETED(OLD) 00197 
  50. D - /*                                                                                00197  DELETED(OLD) 00198 
  51. D -  * The prototype for SimplePartHandleMouseDownEdgeResize was replaced by the fol  00197  DELETED(OLD) 00199 
  52. D -  */                                                                               00197  DELETED(OLD) 00200 
  53. D -                                                                                   00197  DELETED(OLD) 00201 
  54. D - /*                                                                                00197  DELETED(OLD) 00202 
  55. D -  * SOM_Scope ODBoolean  SOMLINK SimplePartHandleMouseDownEdgeResize(SimplePart *  00197  DELETED(OLD) 00203 
  56. D -  *                                                                   Environment  00197  DELETED(OLD) 00204 
  57. D -  *                                                                  ODFacet* fac  00197  DELETED(OLD) 00205 
  58. D -  *                                                                  Proxy* selec  00197  DELETED(OLD) 00206 
  59. D -  *                                                                  POINTL mouse  00197  DELETED(OLD) 00207 
  60. D -  */                                                                               00197  DELETED(OLD) 00208 
  61. D -                                                                                   00197  DELETED(OLD) 00209 
  62. SUPERC2 -- IBM OS/2 PC LINE COMPARE                 06/06/95  10:38  PAGE   2 
  63. NEW FILE =  E:\OPENDOC7\SAMPLES\PARTS\SIMPLPRT\SIMPLPRT.CPP 
  64. OLD FILE =    G:\SMARTPRT\SMARTPRT.CPP 
  65.                      LINE COMPARE SOURCE SECTION 
  66. ID  ----+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8 NEW REF#  CHNG TYPE   OLD REF# 
  67. D - /*                                                                                00197  DELETED(OLD) 00210 
  68. D -  * The prototype for SimplePartHandleMouseDownEdgeResize was replaced by the fol  00197  DELETED(OLD) 00211 
  69. D -  */                                                                               00197  DELETED(OLD) 00212 
  70.                                                  MATCH=   12           DEL=   24 
  71. D -                                                                                   00209  DELETED(OLD) 00225 
  72. D - /*                                                                                00209  DELETED(OLD) 00226 
  73. D -  * SOM_Scope ODBoolean  SOMLINK SimplePartHandleMouseDownCornerResize(SimplePart  00209  DELETED(OLD) 00227 
  74. D -  *                                                                     Environme  00209  DELETED(OLD) 00228 
  75. D -  *                                                                    ODFacet* f  00209  DELETED(OLD) 00229 
  76. D -  *                                                                    Proxy* sel  00209  DELETED(OLD) 00230 
  77. D -  *                                                                    POINTL* mo  00209  DELETED(OLD) 00231 
  78. D -  */                                                                               00209  DELETED(OLD) 00232 
  79. D -                                                                                   00209  DELETED(OLD) 00233 
  80. D - /*                                                                                00209  DELETED(OLD) 00234 
  81. D -  * The prototype for SimplePartHandleMouseDownCornerResize was replaced by the f  00209  DELETED(OLD) 00235 
  82. D -  */                                                                               00209  DELETED(OLD) 00236 
  83. D -                                                                                   00209  DELETED(OLD) 00237 
  84. D - /*                                                                                00209  DELETED(OLD) 00238 
  85. D -  * SOM_Scope ODBoolean  SOMLINK SimplePartHandleMouseDownCornerResize(SimplePart  00209  DELETED(OLD) 00239 
  86. D -  *                                                                     Environme  00209  DELETED(OLD) 00240 
  87. D -  *                                                                    ODFacet* f  00209  DELETED(OLD) 00241 
  88. D -  *                                                                    Proxy* sel  00209  DELETED(OLD) 00242 
  89. D -  *                                                                    POINTL mou  00209  DELETED(OLD) 00243 
  90. D -  */                                                                               00209  DELETED(OLD) 00244 
  91. D -                                                                                   00209  DELETED(OLD) 00245 
  92. D - /*                                                                                00209  DELETED(OLD) 00246 
  93. D -  * The prototype for SimplePartHandleMouseDownCornerResize was replaced by the f  00209  DELETED(OLD) 00247 
  94. D -  */                                                                               00209  DELETED(OLD) 00248 
  95.                                                  MATCH=  286           DEL=   23 
  96. D -                                                                                   00495  DELETED(OLD) 00535 
  97. D - /*                                                                                00495  DELETED(OLD) 00536 
  98. D -  * SOM_Scope MRESULT  SOMLINK SimplePartDragEnter(SimplePart *somSelf,            00495  DELETED(OLD) 00537 
  99. D -  *                                                 Environment *ev,               00495  DELETED(OLD) 00538 
  100. D -  *                                                ODDragItemIterator* dragInfo,   00495  DELETED(OLD) 00539 
  101. D -  *                                                ODFacet* facet,                 00495  DELETED(OLD) 00540 
  102. D -  *                                                ODPoint* where)                 00495  DELETED(OLD) 00541 
  103. D -  */                                                                               00495  DELETED(OLD) 00542 
  104. D -                                                                                   00495  DELETED(OLD) 00543 
  105. D - /*                                                                                00495  DELETED(OLD) 00544 
  106. D -  * The prototype for SimplePartDragEnter was replaced by the following prototype  00495  DELETED(OLD) 00545 
  107. D -  */                                                                               00495  DELETED(OLD) 00546 
  108. D -                                                                                   00495  DELETED(OLD) 00547 
  109. D - /*                                                                                00495  DELETED(OLD) 00548 
  110. D -  * SOM_Scope void  SOMLINK SimplePartDragEnter(SimplePart *somSelf,               00495  DELETED(OLD) 00549 
  111. D -  *                                              Environment *ev,                  00495  DELETED(OLD) 00550 
  112. D -  *                                             ODDragItemIterator* dragInfo,      00495  DELETED(OLD) 00551 
  113. D -  *                                             ODFacet* facet, ODPoint* where)    00495  DELETED(OLD) 00552 
  114. D -  */                                                                               00495  DELETED(OLD) 00553 
  115. D -                                                                                   00495  DELETED(OLD) 00554 
  116. D - /*                                                                                00495  DELETED(OLD) 00555 
  117. D -  * The prototype for SimplePartDragEnter was replaced by the following prototype  00495  DELETED(OLD) 00556 
  118. D -  */                                                                               00495  DELETED(OLD) 00557 
  119.                                                  MATCH=   14           DEL=   24 
  120. D -                                                                                   00509  DELETED(OLD) 00572 
  121. D - /*                                                                                00509  DELETED(OLD) 00573 
  122. D -  * SOM_Scope MRESULT  SOMLINK SimplePartDragWithin(SimplePart *somSelf,           00509  DELETED(OLD) 00574 
  123. SUPERC2 -- IBM OS/2 PC LINE COMPARE                 06/06/95  10:38  PAGE   3 
  124. NEW FILE =  E:\OPENDOC7\SAMPLES\PARTS\SIMPLPRT\SIMPLPRT.CPP 
  125. OLD FILE =    G:\SMARTPRT\SMARTPRT.CPP 
  126.                      LINE COMPARE SOURCE SECTION 
  127. ID  ----+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8 NEW REF#  CHNG TYPE   OLD REF# 
  128. D -  *                                                  Environment *ev,              00509  DELETED(OLD) 00575 
  129. D -  *                                                 ODDragItemIterator* dragInfo,  00509  DELETED(OLD) 00576 
  130. D -  *                                                 ODFacet* facet,                00509  DELETED(OLD) 00577 
  131. D -  *                                                 ODPoint* where)                00509  DELETED(OLD) 00578 
  132. D -  */                                                                               00509  DELETED(OLD) 00579 
  133. D -                                                                                   00509  DELETED(OLD) 00580 
  134. D - /*                                                                                00509  DELETED(OLD) 00581 
  135. D -  * The prototype for SimplePartDragWithin was replaced by the following prototyp  00509  DELETED(OLD) 00582 
  136. D -  */                                                                               00509  DELETED(OLD) 00583 
  137. D -                                                                                   00509  DELETED(OLD) 00584 
  138. D - /*                                                                                00509  DELETED(OLD) 00585 
  139. D -  * SOM_Scope void  SOMLINK SimplePartDragWithin(SimplePart *somSelf,              00509  DELETED(OLD) 00586 
  140. D -  *                                               Environment *ev,                 00509  DELETED(OLD) 00587 
  141. D -  *                                              ODDragItemIterator* dragInfo,     00509  DELETED(OLD) 00588 
  142. D -  *                                              ODFacet* facet,                   00509  DELETED(OLD) 00589 
  143. D -  *                                              ODPoint* where)                   00509  DELETED(OLD) 00590 
  144. D -  */                                                                               00509  DELETED(OLD) 00591 
  145. D -                                                                                   00509  DELETED(OLD) 00592 
  146. D - /*                                                                                00509  DELETED(OLD) 00593 
  147. D -  * The prototype for SimplePartDragWithin was replaced by the following prototyp  00509  DELETED(OLD) 00594 
  148. D -  */                                                                               00509  DELETED(OLD) 00595 
  149.                                                  MATCH=  128 INS=    1 DEL=    1 
  150. I -           delete pInfo;                                                           00637  INSERT(NEW)  00724 
  151. D -         //  delete pInfo;                                                         00638  DELETED(OLD) 00724 
  152.                                                  MATCH=   11 INS=    1 DEL=    1 
  153. I -     somSelf->RemoveDisplayFrame( ev, frame );                                     00649  INSERT(NEW)  00736 
  154. D - //    somSelf->RemoveDisplayFrame( ev, frame );                                   00650  DELETED(OLD) 00736 
  155.                                                  MATCH=   65 INS=    1 DEL=    4 
  156. I -       PartInfoRec* partInfo = new PartInfoRec;                                    00715  INSERT(NEW)  00802 
  157. D - //      PartInfoRec* partInfo = new PartInfoRec;                                  00716  DELETED(OLD) 00802 
  158. D -       // Derived class must create PartInfoRec.  Would like to add different int  00716  DELETED(OLD) 00803 
  159. D -       // initializing partinfo.      mcs 3/21/95                                  00716  DELETED(OLD) 00804 
  160. D -       PartInfoRec* partInfo = (PartInfoRec*)frame->GetPartInfo(ev);               00716  DELETED(OLD) 00805 
  161.                                                  MATCH=  158 INS=    1 DEL=    1 
  162. I -          clipShape->Transform(ev, facet->GetFrameTransform(ev));                  00874  INSERT(NEW)  00964 
  163. D -          clipShape->Transform(ev, facet->GetContentTransform(ev));                00875  DELETED(OLD) 00964 
  164.                                                  MATCH=  209           DEL=    1 
  165. D -                                                                                   01084  DELETED(OLD) 01174 
  166.                                                  MATCH=   27 INS=    6 DEL=   11 
  167. I -     su->AddProperty(ev, kODPropPart);                                             01111  INSERT(NEW)  01202 
  168. I -     su->AddValue(ev, kODISOStr);                                                  01112  INSERT(NEW)  01202 
  169. I -     su->SetValue(ev, strlen(kKindTestSimple) + 1, (ODValue) kKindTestSimple);     01113  INSERT(NEW)  01202 
  170. I -     su->AddProperty(ev, kODPropContents);                                         01114  INSERT(NEW)  01202 
  171. I -     su->AddValue(ev, (ODValueType) kSimplePartValueType);                         01115  INSERT(NEW)  01202 
  172. I -     su->SetValue(ev, sizeof(RGBColor),  (ODValue) &_fDefaultColor);               01116  INSERT(NEW)  01202 
  173. D -                                                                                   01117  DELETED(OLD) 01202 
  174. D - // mcs   The following was moved to InitPart.                                     01117  DELETED(OLD) 01203 
  175. D - // mcs    su->AddProperty(ev, kODPropPart);                                       01117  DELETED(OLD) 01204 
  176. D - // mcs    su->AddValue(ev, kODISOStr);                                            01117  DELETED(OLD) 01205 
  177. D - // mcs    su->SetValue(ev, strlen(kKindTestSimple) + 1, (ODValue) kKindTestSimpl  01117  DELETED(OLD) 01206 
  178. D - // mcs    su->AddProperty(ev, kODPropContents);                                   01117  DELETED(OLD) 01207 
  179. D - // mcs    su->AddValue(ev, (ODValueType) kSimplePartValueType);                   01117  DELETED(OLD) 01208 
  180. D -                                                                                   01117  DELETED(OLD) 01209 
  181. D - // mcs Don't need to save color value since derived part isn't using SimplePart'  01117  DELETED(OLD) 01210 
  182. D - // mcs method.                                                                    01117  DELETED(OLD) 01211 
  183. D - // mcs   auxsu->SetValue(ev, sizeof(RGBColor),  (ODValue) &_fDefaultColor);       01117  DELETED(OLD) 01212 
  184. SUPERC2 -- IBM OS/2 PC LINE COMPARE                 06/06/95  10:38  PAGE   4 
  185. NEW FILE =  E:\OPENDOC7\SAMPLES\PARTS\SIMPLPRT\SIMPLPRT.CPP 
  186. OLD FILE =    G:\SMARTPRT\SMARTPRT.CPP 
  187.                      LINE COMPARE SOURCE SECTION 
  188. ID  ----+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8 NEW REF#  CHNG TYPE   OLD REF# 
  189.                                                  MATCH=  182 INS=    2 DEL=    4 
  190. I -     if (somSelf->IsInitialized(ev))                                               01299  INSERT(NEW)  01395 
  191. I -       return;                                                                     01300  INSERT(NEW)  01395 
  192. D - // mcs Hack for now; IsInitialized will be true when SimplePartInitPart is calle  01301  DELETED(OLD) 01395 
  193. D - // mcs from derived class' InitPart.                                              01301  DELETED(OLD) 01396 
  194. D - // mcs    if (somSelf->IsInitialized(ev))                                         01301  DELETED(OLD) 01397 
  195. D - // mcs      return;                                                               01301  DELETED(OLD) 01398 
  196.                                                  MATCH=    3           DEL=    5 
  197. D - //    storageUnit->AddProperty(ev, kODPropPart);                                  01304  DELETED(OLD) 01402 
  198. D - //    storageUnit->AddValue(ev, kODISOStr);                                       01304  DELETED(OLD) 01403 
  199. D - //    storageUnit->SetValue(ev, strlen(kKindTestSimple) + 1, (ODValue) kKindTest  01304  DELETED(OLD) 01404 
  200. D - //    storageUnit->AddProperty(ev, kODPropContents);                              01304  DELETED(OLD) 01405 
  201. D - //    storageUnit->AddValue(ev, (ODValueType) kSimplePartValueType);              01304  DELETED(OLD) 01406 
  202.                                                  MATCH=   22 INS=    3 DEL=    3 
  203. I -     ODStorageUnit* su = somSelf->GetStorageUnit(ev);                              01326  INSERT(NEW)  01429 
  204. D - //    ODStorageUnit* su = somSelf->GetStorageUnit(ev);                            01327  DELETED(OLD) 01429 
  205. I -     su->Focus(ev, kODPropContents, kODPosUndefined, kSimplePartValueType, 0, kOD  01327  INSERT(NEW)  01430 
  206. D - //    su->Focus(ev, kODPropContents, kODPosUndefined, kSimplePartValueType, 0, k  01328  DELETED(OLD) 01430 
  207. I -     su->GetValue(ev, sizeof(RGBColor), (ODValue) &_fDefaultColor);                01328  INSERT(NEW)  01431 
  208. D - //    su->GetValue(ev, sizeof(RGBColor), (ODValue) &_fDefaultColor);              01329  DELETED(OLD) 01431 
  209.                                                  MATCH=   45 
  210. SUPERC2 -- IBM OS/2 PC LINE COMPARE                 06/06/95  10:38  PAGE   5 
  211. NEW FILE =  E:\OPENDOC7\SAMPLES\PARTS\SIMPLPRT\SIMPLPRT.CPP 
  212. OLD FILE =    G:\SMARTPRT\SMARTPRT.CPP 
  213.                      LINE COMPARE SUMMARY AND STATISTICS 
  214.    1340 NUMBER OF LINE MATCHES       147  TOTAL CHANGES (PAIRED+NONPAIRED CHNG) 
  215.       0 REFORMATTED LINES             22  PAIRED CHANGES (REFM+PAIRED INS/DEL) 
  216.      33 NEW FILE LINE INSERTIONS      11  NON-PAIRED INSERTS 
  217.     136 OLD FILE LINE DELETIONS      114  NON-PAIRED DELETES 
  218.    1373 NEW FILE LINES PROCESSED 
  219.    1476 OLD FILE LINES PROCESSED 
  220.  LISTING TYPE = DELTA   COMPARE COLUMNS =     1:EOL    LONGEST LINE =  106 
  221.  PROCESS OPTIONS SPECIFIED: NONE 
  222. **INFORM** SOURCE LINES IN THE LISTING MAY BE TRUNCATED DUE TO 80 COLUMN MAXIMUM OUTPUT LIMIT. 
  223.  THE PROCESSED FILES HAVE DIFFERENCES. 
  224.