Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\Editor.h
Last modified2005-03-21 12:17:52.000 +0100
Size15.9 Kb (572 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\Editor.h
Last modified2006-03-16 13:07:06.001 +0100
Size16.1 Kb (581 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged13568
Inserted810
Deleted11
Ignored00
Changed36



   Comparison Details  

63 skipped lines
64 64     int edgeColumn;
65 65     char *chars;
66 66     unsigned char *styles;
  67     int styleBitsSet;
67 68     char *indicators;
68 69     int *positions;
69 70     char bracePreviousStyles[2];
35 skipped lines
105 106     LineLayout **cache;
106 107     bool allInvalidated;
107 108     int styleClock;
  109     int useCount;
108 110     void Allocate(int length_);
109 111     void AllocateForLevel(int linesOnScreen, int linesInDoc);
110 112 public:
107 skipped lines
218 220     int scrollWidth;
219 221     bool verticalScrollBarVisible;
220 222     bool endAtLastLine;
  223     bool caretSticky;
221 224  
222 225     Surface *pixmapLine;
223 226     Surface *pixmapSelMargin;
77 skipped lines
301 304     int hsEnd;
302 305  
303 306     // Wrapping support
304     enum { eWrapNone, eWrapWord } wrapState; 307     enum { eWrapNone, eWrapWord, eWrapChar } wrapState;
305 308     bool backgroundWrapEnabled;
306 309     int wrapWidth;
307 310     int docLineLastWrapped;
3 skipped lines
311 314     int wrapVisualStartIndent;
312 315     int actualWrapVisualStartIndent;
313 316  
  317     bool convertPastes;
  318  
314 319     Document *pdoc;
315 320  
316 321     Editor();
24 skipped lines
341 346     bool AbandonPaint();
342 347     void RedrawRect(PRectangle rc);
343 348     void Redraw();
344     void RedrawSelMargin(); 349     void RedrawSelMargin(int line=-1);
345 350     PRectangle RectangleFromRange(int start, int end);
346 351     void InvalidateRange(int start, int end);
347 352  
1 skipped line
349 354     bool SelectionEmpty();
350 355     int SelectionStart();
351 356     int SelectionEnd();
  357     void SetRectangularRange();
352 358     void InvalidateSelection(int currentPos_, int anchor_);
353 359     void SetSelection(int currentPos_, int anchor_);
354 360     void SetSelection(int currentPos_);
95 skipped lines
450 456     void PageMove(int direction, selTypes sel=noSel, bool stuttered = false);
451 457     void ChangeCaseOfSelection(bool makeUpperCase);
452 458     void LineTranspose();
453     void LineDuplicate(); 459     void Duplicate(bool forLine);
454 460     virtual void CancelModes();
455 461     void NewLine();
456 462     void CursorUpOrDown(int direction, selTypes sel=noSel);
  463     void ParaUpOrDown(int direction, selTypes sel=noSel);
457 464     int StartEndDisplayLine(int pos, bool start);
458 465     virtual int KeyCommand(unsigned int iMessage);
459 466     virtual int KeyDefault(int /* key */, int /*modifiers*/);
39 skipped lines
499 506     virtual bool HaveMouseCapture() = 0;
500 507     void SetFocusState(bool focusState);
501 508  
  509     virtual bool PaintContains(PRectangle rc);
  510     bool PaintContainsMargin();
502 511     void CheckForChangeOutsidePaint(Range r);
503     int BraceMatch(int position, int maxReStyle);  
504 512     void SetBraceHighlight(Position pos0, Position pos1, int matchStyle);
505 513  
506 514     void SetDocPointer(Document *document);
9 skipped lines
516 524     void GetHotSpotRange(int& hsStart, int& hsEnd);
517 525  
518 526     int CodePage() const;
  527     int WrapCount(int line);
519 528  
520 529     virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) = 0;
521 530  
51 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:18.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.