home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
OS/2 Shareware BBS: 10 Tools
/
10-Tools.zip
/
ibmodf.zip
/
SIMPLPRT.ZIP
/
SIMPLPRT.SUP
< prev
next >
Wrap
Text File
|
1995-06-06
|
23KB
|
224 lines
SUPERC2 -- IBM OS/2 PC LINE COMPARE 06/06/95 10:38 PAGE 1
NEW FILE = E:\OPENDOC7\SAMPLES\PARTS\SIMPLPRT\SIMPLPRT.CPP
OLD FILE = G:\SMARTPRT\SMARTPRT.CPP
LINE COMPARE SOURCE SECTION
ID ----+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8 NEW REF# CHNG TYPE OLD REF#
DEL= 1
D - 00001 DELETED(OLD) 00001
MATCH= 1 INS= 14 DEL= 3
I - * File: simplprt.cpp //+(rlt 3-8-95) 00002 INSERT(NEW) 00003
I - * 00003 INSERT(NEW) 00003
I - * Contains: IDL description of Container Part 00004 INSERT(NEW) 00003
I - * 00005 INSERT(NEW) 00003
I - * Written by: Jason Crawford 00006 INSERT(NEW) 00003
I - * 00007 INSERT(NEW) 00003
I - * 00008 INSERT(NEW) 00003
I - * Change History (most recent first): 00009 INSERT(NEW) 00003
I - * 00010 INSERT(NEW) 00003
I - * <3> 3-8-95 rlt Fixed clips based on Content transformat 00011 INSERT(NEW) 00003
I - * <2> 3-8-95 rlt Changed Default color 00012 INSERT(NEW) 00003
I - * <1> 3-8-95 rlt Added History preamble 00013 INSERT(NEW) 00003
I - * 00014 INSERT(NEW) 00003
I - * 00015 INSERT(NEW) 00003
D - * This file was generated by the SOM Compiler. 00016 DELETED(OLD) 00003
D - * Generated using: 00016 DELETED(OLD) 00004
D - * SOM incremental update: 2.41 00016 DELETED(OLD) 00005
MATCH= 1 DEL= 2
D - 00017 DELETED(OLD) 00007
D - 00017 DELETED(OLD) 00008
MATCH= 41 INS= 2 DEL= 2
I - #include "SimplPrt.xih" 00058 INSERT(NEW) 00050
D - #include "SmartPrt.xih" 00059 DELETED(OLD) 00050
I - #include "PartInfo.hpp" //mcs aj - we have made PartInfo public 00059 INSERT(NEW) 00051
D - #include "PartInfo.hpp" 00060 DELETED(OLD) 00051
MATCH= 35 INS= 1 DEL= 1
I - //#if 1 mcs aj 00095 INSERT(NEW) 00087
D - //#if 1 mcs 00096 DELETED(OLD) 00087
MATCH= 47 INS= 1 DEL= 1
I - static int defcolor = 4; //+ (rlt - 3-8-95) 00143 INSERT(NEW) 00135
D - static int defcolor = 0; 00144 DELETED(OLD) 00135
MATCH= 53 DEL= 24
D - 00197 DELETED(OLD) 00189
D - /* 00197 DELETED(OLD) 00190
D - * SOM_Scope ODBoolean SOMLINK SimplePartHandleMouseDownEdgeResize(SimplePart * 00197 DELETED(OLD) 00191
D - * Environment 00197 DELETED(OLD) 00192
D - * ODFacet* fac 00197 DELETED(OLD) 00193
D - * Proxy* selec 00197 DELETED(OLD) 00194
D - * POINTL* mous 00197 DELETED(OLD) 00195
D - */ 00197 DELETED(OLD) 00196
D - 00197 DELETED(OLD) 00197
D - /* 00197 DELETED(OLD) 00198
D - * The prototype for SimplePartHandleMouseDownEdgeResize was replaced by the fol 00197 DELETED(OLD) 00199
D - */ 00197 DELETED(OLD) 00200
D - 00197 DELETED(OLD) 00201
D - /* 00197 DELETED(OLD) 00202
D - * SOM_Scope ODBoolean SOMLINK SimplePartHandleMouseDownEdgeResize(SimplePart * 00197 DELETED(OLD) 00203
D - * Environment 00197 DELETED(OLD) 00204
D - * ODFacet* fac 00197 DELETED(OLD) 00205
D - * Proxy* selec 00197 DELETED(OLD) 00206
D - * POINTL mouse 00197 DELETED(OLD) 00207
D - */ 00197 DELETED(OLD) 00208
D - 00197 DELETED(OLD) 00209
SUPERC2 -- IBM OS/2 PC LINE COMPARE 06/06/95 10:38 PAGE 2
NEW FILE = E:\OPENDOC7\SAMPLES\PARTS\SIMPLPRT\SIMPLPRT.CPP
OLD FILE = G:\SMARTPRT\SMARTPRT.CPP
LINE COMPARE SOURCE SECTION
ID ----+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8 NEW REF# CHNG TYPE OLD REF#
D - /* 00197 DELETED(OLD) 00210
D - * The prototype for SimplePartHandleMouseDownEdgeResize was replaced by the fol 00197 DELETED(OLD) 00211
D - */ 00197 DELETED(OLD) 00212
MATCH= 12 DEL= 24
D - 00209 DELETED(OLD) 00225
D - /* 00209 DELETED(OLD) 00226
D - * SOM_Scope ODBoolean SOMLINK SimplePartHandleMouseDownCornerResize(SimplePart 00209 DELETED(OLD) 00227
D - * Environme 00209 DELETED(OLD) 00228
D - * ODFacet* f 00209 DELETED(OLD) 00229
D - * Proxy* sel 00209 DELETED(OLD) 00230
D - * POINTL* mo 00209 DELETED(OLD) 00231
D - */ 00209 DELETED(OLD) 00232
D - 00209 DELETED(OLD) 00233
D - /* 00209 DELETED(OLD) 00234
D - * The prototype for SimplePartHandleMouseDownCornerResize was replaced by the f 00209 DELETED(OLD) 00235
D - */ 00209 DELETED(OLD) 00236
D - 00209 DELETED(OLD) 00237
D - /* 00209 DELETED(OLD) 00238
D - * SOM_Scope ODBoolean SOMLINK SimplePartHandleMouseDownCornerResize(SimplePart 00209 DELETED(OLD) 00239
D - * Environme 00209 DELETED(OLD) 00240
D - * ODFacet* f 00209 DELETED(OLD) 00241
D - * Proxy* sel 00209 DELETED(OLD) 00242
D - * POINTL mou 00209 DELETED(OLD) 00243
D - */ 00209 DELETED(OLD) 00244
D - 00209 DELETED(OLD) 00245
D - /* 00209 DELETED(OLD) 00246
D - * The prototype for SimplePartHandleMouseDownCornerResize was replaced by the f 00209 DELETED(OLD) 00247
D - */ 00209 DELETED(OLD) 00248
MATCH= 286 DEL= 23
D - 00495 DELETED(OLD) 00535
D - /* 00495 DELETED(OLD) 00536
D - * SOM_Scope MRESULT SOMLINK SimplePartDragEnter(SimplePart *somSelf, 00495 DELETED(OLD) 00537
D - * Environment *ev, 00495 DELETED(OLD) 00538
D - * ODDragItemIterator* dragInfo, 00495 DELETED(OLD) 00539
D - * ODFacet* facet, 00495 DELETED(OLD) 00540
D - * ODPoint* where) 00495 DELETED(OLD) 00541
D - */ 00495 DELETED(OLD) 00542
D - 00495 DELETED(OLD) 00543
D - /* 00495 DELETED(OLD) 00544
D - * The prototype for SimplePartDragEnter was replaced by the following prototype 00495 DELETED(OLD) 00545
D - */ 00495 DELETED(OLD) 00546
D - 00495 DELETED(OLD) 00547
D - /* 00495 DELETED(OLD) 00548
D - * SOM_Scope void SOMLINK SimplePartDragEnter(SimplePart *somSelf, 00495 DELETED(OLD) 00549
D - * Environment *ev, 00495 DELETED(OLD) 00550
D - * ODDragItemIterator* dragInfo, 00495 DELETED(OLD) 00551
D - * ODFacet* facet, ODPoint* where) 00495 DELETED(OLD) 00552
D - */ 00495 DELETED(OLD) 00553
D - 00495 DELETED(OLD) 00554
D - /* 00495 DELETED(OLD) 00555
D - * The prototype for SimplePartDragEnter was replaced by the following prototype 00495 DELETED(OLD) 00556
D - */ 00495 DELETED(OLD) 00557
MATCH= 14 DEL= 24
D - 00509 DELETED(OLD) 00572
D - /* 00509 DELETED(OLD) 00573
D - * SOM_Scope MRESULT SOMLINK SimplePartDragWithin(SimplePart *somSelf, 00509 DELETED(OLD) 00574
SUPERC2 -- IBM OS/2 PC LINE COMPARE 06/06/95 10:38 PAGE 3
NEW FILE = E:\OPENDOC7\SAMPLES\PARTS\SIMPLPRT\SIMPLPRT.CPP
OLD FILE = G:\SMARTPRT\SMARTPRT.CPP
LINE COMPARE SOURCE SECTION
ID ----+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8 NEW REF# CHNG TYPE OLD REF#
D - * Environment *ev, 00509 DELETED(OLD) 00575
D - * ODDragItemIterator* dragInfo, 00509 DELETED(OLD) 00576
D - * ODFacet* facet, 00509 DELETED(OLD) 00577
D - * ODPoint* where) 00509 DELETED(OLD) 00578
D - */ 00509 DELETED(OLD) 00579
D - 00509 DELETED(OLD) 00580
D - /* 00509 DELETED(OLD) 00581
D - * The prototype for SimplePartDragWithin was replaced by the following prototyp 00509 DELETED(OLD) 00582
D - */ 00509 DELETED(OLD) 00583
D - 00509 DELETED(OLD) 00584
D - /* 00509 DELETED(OLD) 00585
D - * SOM_Scope void SOMLINK SimplePartDragWithin(SimplePart *somSelf, 00509 DELETED(OLD) 00586
D - * Environment *ev, 00509 DELETED(OLD) 00587
D - * ODDragItemIterator* dragInfo, 00509 DELETED(OLD) 00588
D - * ODFacet* facet, 00509 DELETED(OLD) 00589
D - * ODPoint* where) 00509 DELETED(OLD) 00590
D - */ 00509 DELETED(OLD) 00591
D - 00509 DELETED(OLD) 00592
D - /* 00509 DELETED(OLD) 00593
D - * The prototype for SimplePartDragWithin was replaced by the following prototyp 00509 DELETED(OLD) 00594
D - */ 00509 DELETED(OLD) 00595
MATCH= 128 INS= 1 DEL= 1
I - delete pInfo; 00637 INSERT(NEW) 00724
D - // delete pInfo; 00638 DELETED(OLD) 00724
MATCH= 11 INS= 1 DEL= 1
I - somSelf->RemoveDisplayFrame( ev, frame ); 00649 INSERT(NEW) 00736
D - // somSelf->RemoveDisplayFrame( ev, frame ); 00650 DELETED(OLD) 00736
MATCH= 65 INS= 1 DEL= 4
I - PartInfoRec* partInfo = new PartInfoRec; 00715 INSERT(NEW) 00802
D - // PartInfoRec* partInfo = new PartInfoRec; 00716 DELETED(OLD) 00802
D - // Derived class must create PartInfoRec. Would like to add different int 00716 DELETED(OLD) 00803
D - // initializing partinfo. mcs 3/21/95 00716 DELETED(OLD) 00804
D - PartInfoRec* partInfo = (PartInfoRec*)frame->GetPartInfo(ev); 00716 DELETED(OLD) 00805
MATCH= 158 INS= 1 DEL= 1
I - clipShape->Transform(ev, facet->GetFrameTransform(ev)); 00874 INSERT(NEW) 00964
D - clipShape->Transform(ev, facet->GetContentTransform(ev)); 00875 DELETED(OLD) 00964
MATCH= 209 DEL= 1
D - 01084 DELETED(OLD) 01174
MATCH= 27 INS= 6 DEL= 11
I - su->AddProperty(ev, kODPropPart); 01111 INSERT(NEW) 01202
I - su->AddValue(ev, kODISOStr); 01112 INSERT(NEW) 01202
I - su->SetValue(ev, strlen(kKindTestSimple) + 1, (ODValue) kKindTestSimple); 01113 INSERT(NEW) 01202
I - su->AddProperty(ev, kODPropContents); 01114 INSERT(NEW) 01202
I - su->AddValue(ev, (ODValueType) kSimplePartValueType); 01115 INSERT(NEW) 01202
I - su->SetValue(ev, sizeof(RGBColor), (ODValue) &_fDefaultColor); 01116 INSERT(NEW) 01202
D - 01117 DELETED(OLD) 01202
D - // mcs The following was moved to InitPart. 01117 DELETED(OLD) 01203
D - // mcs su->AddProperty(ev, kODPropPart); 01117 DELETED(OLD) 01204
D - // mcs su->AddValue(ev, kODISOStr); 01117 DELETED(OLD) 01205
D - // mcs su->SetValue(ev, strlen(kKindTestSimple) + 1, (ODValue) kKindTestSimpl 01117 DELETED(OLD) 01206
D - // mcs su->AddProperty(ev, kODPropContents); 01117 DELETED(OLD) 01207
D - // mcs su->AddValue(ev, (ODValueType) kSimplePartValueType); 01117 DELETED(OLD) 01208
D - 01117 DELETED(OLD) 01209
D - // mcs Don't need to save color value since derived part isn't using SimplePart' 01117 DELETED(OLD) 01210
D - // mcs method. 01117 DELETED(OLD) 01211
D - // mcs auxsu->SetValue(ev, sizeof(RGBColor), (ODValue) &_fDefaultColor); 01117 DELETED(OLD) 01212
SUPERC2 -- IBM OS/2 PC LINE COMPARE 06/06/95 10:38 PAGE 4
NEW FILE = E:\OPENDOC7\SAMPLES\PARTS\SIMPLPRT\SIMPLPRT.CPP
OLD FILE = G:\SMARTPRT\SMARTPRT.CPP
LINE COMPARE SOURCE SECTION
ID ----+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8 NEW REF# CHNG TYPE OLD REF#
MATCH= 182 INS= 2 DEL= 4
I - if (somSelf->IsInitialized(ev)) 01299 INSERT(NEW) 01395
I - return; 01300 INSERT(NEW) 01395
D - // mcs Hack for now; IsInitialized will be true when SimplePartInitPart is calle 01301 DELETED(OLD) 01395
D - // mcs from derived class' InitPart. 01301 DELETED(OLD) 01396
D - // mcs if (somSelf->IsInitialized(ev)) 01301 DELETED(OLD) 01397
D - // mcs return; 01301 DELETED(OLD) 01398
MATCH= 3 DEL= 5
D - // storageUnit->AddProperty(ev, kODPropPart); 01304 DELETED(OLD) 01402
D - // storageUnit->AddValue(ev, kODISOStr); 01304 DELETED(OLD) 01403
D - // storageUnit->SetValue(ev, strlen(kKindTestSimple) + 1, (ODValue) kKindTest 01304 DELETED(OLD) 01404
D - // storageUnit->AddProperty(ev, kODPropContents); 01304 DELETED(OLD) 01405
D - // storageUnit->AddValue(ev, (ODValueType) kSimplePartValueType); 01304 DELETED(OLD) 01406
MATCH= 22 INS= 3 DEL= 3
I - ODStorageUnit* su = somSelf->GetStorageUnit(ev); 01326 INSERT(NEW) 01429
D - // ODStorageUnit* su = somSelf->GetStorageUnit(ev); 01327 DELETED(OLD) 01429
I - su->Focus(ev, kODPropContents, kODPosUndefined, kSimplePartValueType, 0, kOD 01327 INSERT(NEW) 01430
D - // su->Focus(ev, kODPropContents, kODPosUndefined, kSimplePartValueType, 0, k 01328 DELETED(OLD) 01430
I - su->GetValue(ev, sizeof(RGBColor), (ODValue) &_fDefaultColor); 01328 INSERT(NEW) 01431
D - // su->GetValue(ev, sizeof(RGBColor), (ODValue) &_fDefaultColor); 01329 DELETED(OLD) 01431
MATCH= 45
SUPERC2 -- IBM OS/2 PC LINE COMPARE 06/06/95 10:38 PAGE 5
NEW FILE = E:\OPENDOC7\SAMPLES\PARTS\SIMPLPRT\SIMPLPRT.CPP
OLD FILE = G:\SMARTPRT\SMARTPRT.CPP
LINE COMPARE SUMMARY AND STATISTICS
1340 NUMBER OF LINE MATCHES 147 TOTAL CHANGES (PAIRED+NONPAIRED CHNG)
0 REFORMATTED LINES 22 PAIRED CHANGES (REFM+PAIRED INS/DEL)
33 NEW FILE LINE INSERTIONS 11 NON-PAIRED INSERTS
136 OLD FILE LINE DELETIONS 114 NON-PAIRED DELETES
1373 NEW FILE LINES PROCESSED
1476 OLD FILE LINES PROCESSED
LISTING TYPE = DELTA COMPARE COLUMNS = 1:EOL LONGEST LINE = 106
PROCESS OPTIONS SPECIFIED: NONE
**INFORM** SOURCE LINES IN THE LISTING MAY BE TRUNCATED DUE TO 80 COLUMN MAXIMUM OUTPUT LIMIT.
THE PROCESSED FILES HAVE DIFFERENCES.