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