Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\StyleContext.h
Last modified2004-09-28 13:17:26.001 +0200
Size4 Kb (169 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\StyleContext.h
Last modified2006-03-16 13:07:08.000 +0100
Size4.1 Kb (170 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged4166
Inserted00
Deleted00
Ignored00
Changed37



   Comparison Details  

44 skipped lines
45 45         currentPos(startPos),
46 46         atLineStart(true),
47 47         atLineEnd(false),
48         state(initStyle), 48         state(initStyle & chMask), // Mask off all bits which aren't in the chMask.
49 49         chPrev(0),
50 50         ch(0),
51 51         chNext(0) {
52 skipped lines
104 104         return currentPos - styler.GetStartSegment();
105 105     }
106 106     int GetRelative(int n) {
107         return styler.SafeGetCharAt(currentPos+n); 107         return static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+n));
108 108     }
109 109     bool Match(char ch0) {
110 110         return ch == ch0;
23 skipped lines
134 134         return false;
135 135         s++;
136 136         for (int n=2; *s; n++) {
  137         if (*s !=
137         if (*s != tolower((styler.SafeGetCharAt(currentPos+n)))) 138         tolower(static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+n))))
138 139         return false;
139 140         s++;
140 141         }
29 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:35.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.