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
134 134     int MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd=true);
135 135  
136 136     // Gateways to modifying document
  137     void ModifiedAt(int pos);
137 138     bool DeleteChars(int pos, int len);
138 139     bool InsertStyledString(int position, char *s, int insertLength);
139 140     int Undo();
35 skipped lines
175 176     char StyleAt(int position) { return cb.StyleAt(position); }
176 177     int GetMark(int line) { return cb.GetMark(line); }
177 178     int AddMark(int line, int markerNum);
  179     void AddMarkSet(int line, int valueSet);
178 180     void DeleteMark(int line, int markerNum);
179 181     void DeleteMarkFromHandle(int markerHandle);
180 182     void DeleteAllMarks(int markerNum);
47 skipped lines
228 230     int WordPartLeft(int pos);
229 231     int WordPartRight(int pos);
230 232     int ExtendStyleRange(int pos, int delta, bool singleLine = false);
  233     bool IsWhiteLine(int line);
231 234     int ParaUp(int pos);
232 235     int ParaDown(int pos);
233 236     int IndentSize() { return actualIndentInChars; }
  237     int BraceMatch(int position, int maxReStyle);
234 238  
235 239 private:
  240     void CheckReadOnly();
  241  
236 242     charClassification WordCharClass(unsigned char ch);
237 243     bool IsWordStartAt(int pos);
238 244     bool IsWordEndAt(int pos);
239 245     bool IsWordAt(int start, int end);
240     void ModifiedAt(int pos);  
241 246  
242 247     void NotifyModifyAttempt();
243 248     void NotifySavePoint(bool atSavePoint);
17 skipped lines
261 266     int foldLevelPrev;
262 267  
263 268     DocModification(int modificationType_, int position_=0, int length_=0,
264         int linesAdded_=0, const char *text_=0) : 269         int linesAdded_=0, const char *text_=0, int line_=0) :
265 270         modificationType(modificationType_),
266 271         position(position_),
267 272         length(length_),
268 273         linesAdded(linesAdded_),
269 274         text(text_),
270         line(0), 275         line(line_),
271 276         foldLevelNow(0),
272 277         foldLevelPrev(0) {}
273 278  
274     DocModification(int modificationType_, const Action &act, int linesAdded_=0) : 279     DocModification(int modificationType_, const Action &act, int linesAdded_=0) :
275 280         modificationType(modificationType_),
276         position(act.position / 2), 281         position(act.position),
277 282         length(act.lenData),
278 283         linesAdded(linesAdded_),
279 284         text(act.data),
22 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:15.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.