Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\Document.h
Last modified2005-03-21 12:17:52.000 +0100
Size8.8 Kb (301 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\Document.h
Last modified2006-03-16 13:07:04.000 +0100
Size8.9 Kb (306 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged11296
Inserted56
Deleted11
Ignored00
Changed48



   Comparison Details  

133 skipped lines
134U134U    int MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd=true);
135U135U 
136U136U    // Gateways to modifying document
  137A    void ModifiedAt(int pos);
137U138U    bool DeleteChars(int pos, int len);
138U139U    bool InsertStyledString(int position, char *s, int insertLength);
139U140U    int Undo();
35 skipped lines
175U176U    char StyleAt(int position) { return cb.StyleAt(position); }
176U177U    int GetMark(int line) { return cb.GetMark(line); }
177U178U    int AddMark(int line, int markerNum);
  179A    void AddMarkSet(int line, int valueSet);
178U180U    void DeleteMark(int line, int markerNum);
179U181U    void DeleteMarkFromHandle(int markerHandle);
180U182U    void DeleteAllMarks(int markerNum);
47 skipped lines
228U230U    int WordPartLeft(int pos);
229U231U    int WordPartRight(int pos);
230U232U    int ExtendStyleRange(int pos, int delta, bool singleLine = false);
  233A    bool IsWhiteLine(int line);
231U234U    int ParaUp(int pos);
232U235U    int ParaDown(int pos);
233U236U    int IndentSize() { return actualIndentInChars; }
  237A    int BraceMatch(int position, int maxReStyle);
234U238U 
235U239Uprivate:
  240A    void CheckReadOnly();
  241A 
236U242U    charClassification WordCharClass(unsigned char ch);
237U243U    bool IsWordStartAt(int pos);
238U244U    bool IsWordEndAt(int pos);
239U245U    bool IsWordAt(int start, int end);
240R    void ModifiedAt(int pos);  
241U246U 
242U247U    void NotifyModifyAttempt();
243U248U    void NotifySavePoint(bool atSavePoint);
17 skipped lines
261U266U    int foldLevelPrev;
262U267U 
263U268U    DocModification(int modificationType_, int position_=0, int length_=0,
264C        int linesAdded_=0, const char *text_=0) : 269C        int linesAdded_=0, const char *text_=0, int line_=0) :
265U270U        modificationType(modificationType_),
266U271U        position(position_),
267U272U        length(length_),
268U273U        linesAdded(linesAdded_),
269U274U        text(text_),
270C        line(0), 275C        line(line_),
271U276U        foldLevelNow(0),
272U277U        foldLevelPrev(0) {}
273U278U 
274C    DocModification(int modificationType_, const Action &act, int linesAdded_=0) : 279C    DocModification(int modificationType_, const Action &act, int linesAdded_=0) :
275U280U        modificationType(modificationType_),
276C        position(act.position / 2), 281C        position(act.position),
277U282U        length(act.lenData),
278U283U        linesAdded(linesAdded_),
279U284U        text(act.data),
22 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.