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
58 58 }
59 59  
60 60 char DocumentAccessor::StyleAt(int position) {
  61     // Mask off all bits which aren't in the 'mask'.
61     return pdoc->StyleAt(position); 62     return static_cast<char>(pdoc->StyleAt(position) & mask);
62 63 }
63 64  
64 65 int DocumentAccessor::GetLine(int position) {
23 skipped lines
88 89 }
89 90  
90 91 void DocumentAccessor::StartAt(unsigned int start, char chMask) {
  92     // Store the mask specified for use with StyleAt.
  93     mask = chMask;
91 94     pdoc->StartStyling(start, chMask);
92 95     startPosStyling = start;
93 96 }
91 skipped lines

   Text comparison Options  

Syntax colouring language used: C / C++
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  

Unchanged lineExample of unchanged line
Modified lineExample of modified line
Added lineExample of added line
Removed lineExample of removed line
Ignored lineExample of ignored line

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