Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\DocumentAccessor.cxx
Last modified2003-09-18 18:28:18.000 +0200
Size4.5 Kb (184 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\DocumentAccessor.cxx
Last modified2006-03-16 13:07:04.000 +0100
Size4.6 Kb (187 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged3183
Inserted12
Deleted00
Ignored00
Changed13



   Comparison Details  

57 skipped lines
58U58U}
59U59U 
60U60Uchar DocumentAccessor::StyleAt(int position) {
  61C    // Mask off all bits which aren't in the 'mask'.
61C    return pdoc->StyleAt(position); 62C    return static_cast<char>(pdoc->StyleAt(position) & mask);
62U63U}
63U64U 
64U65Uint DocumentAccessor::GetLine(int position) {
23 skipped lines
88U89U}
89U90U 
90U91Uvoid DocumentAccessor::StartAt(unsigned int start, char chMask) {
  92A    // Store the mask specified for use with StyleAt.
  93A    mask = chMask;
91U94U    pdoc->StartStyling(start, chMask);
92U95U    startPosStyling = start;
93U96U}
91 skipped lines

   Text comparison Options  

Match character case: yes.
Match line endings: no.
Match spaces

At start of lines: yes,
In middle of lines: yes,
At end of lines: yes.
Blank lines as empty lines: no.
Activate comparison algorithm
At word level: yes,
At character level: no.


   Legend  

UExample of unchanged line
CExample of modified line
AExample of added line
RExample of removed line
IExample of ignored line
Modified text
Added text
Removed text

This report has been generated by Ellié Computing Merge on 2006-09-07 16:23:32.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.