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
64U64U    int edgeColumn;
65U65U    char *chars;
66U66U    unsigned char *styles;
  67A    int styleBitsSet;
67U68U    char *indicators;
68U69U    int *positions;
69U70U    char bracePreviousStyles[2];
35 skipped lines
105U106U    LineLayout **cache;
106U107U    bool allInvalidated;
107U108U    int styleClock;
  109A    int useCount;
108U110U    void Allocate(int length_);
109U111U    void AllocateForLevel(int linesOnScreen, int linesInDoc);
110U112Upublic:
107 skipped lines
218U220U    int scrollWidth;
219U221U    bool verticalScrollBarVisible;
220U222U    bool endAtLastLine;
  223A    bool caretSticky;
221U224U 
222U225U    Surface *pixmapLine;
223U226U    Surface *pixmapSelMargin;
77 skipped lines
301U304U    int hsEnd;
302U305U 
303U306U    // Wrapping support
304C    enum { eWrapNone, eWrapWord } wrapState; 307C    enum { eWrapNone, eWrapWord, eWrapChar } wrapState;
305U308U    bool backgroundWrapEnabled;
306U309U    int wrapWidth;
307U310U    int docLineLastWrapped;
3 skipped lines
311U314U    int wrapVisualStartIndent;
312U315U    int actualWrapVisualStartIndent;
313U316U 
  317A    bool convertPastes;
  318A 
314U319U    Document *pdoc;
315U320U 
316U321U    Editor();
24 skipped lines
341U346U    bool AbandonPaint();
342U347U    void RedrawRect(PRectangle rc);
343U348U    void Redraw();
344C    void RedrawSelMargin(); 349C    void RedrawSelMargin(int line=-1);
345U350U    PRectangle RectangleFromRange(int start, int end);
346U351U    void InvalidateRange(int start, int end);
347U352U 
1 skipped line
349U354U    bool SelectionEmpty();
350U355U    int SelectionStart();
351U356U    int SelectionEnd();
  357A    void SetRectangularRange();
352U358U    void InvalidateSelection(int currentPos_, int anchor_);
353U359U    void SetSelection(int currentPos_, int anchor_);
354U360U    void SetSelection(int currentPos_);
95 skipped lines
450U456U    void PageMove(int direction, selTypes sel=noSel, bool stuttered = false);
451U457U    void ChangeCaseOfSelection(bool makeUpperCase);
452U458U    void LineTranspose();
453C    void LineDuplicate(); 459C    void Duplicate(bool forLine);
454U460U    virtual void CancelModes();
455U461U    void NewLine();
456U462U    void CursorUpOrDown(int direction, selTypes sel=noSel);
  463A    void ParaUpOrDown(int direction, selTypes sel=noSel);
457U464U    int StartEndDisplayLine(int pos, bool start);
458U465U    virtual int KeyCommand(unsigned int iMessage);
459U466U    virtual int KeyDefault(int /* key */, int /*modifiers*/);
39 skipped lines
499U506U    virtual bool HaveMouseCapture() = 0;
500U507U    void SetFocusState(bool focusState);
501U508U 
  509A    virtual bool PaintContains(PRectangle rc);
  510A    bool PaintContainsMargin();
502U511U    void CheckForChangeOutsidePaint(Range r);
503R    int BraceMatch(int position, int maxReStyle);  
504U512U    void SetBraceHighlight(Position pos0, Position pos1, int matchStyle);
505U513U 
506U514U    void SetDocPointer(Document *document);
9 skipped lines
516U524U    void GetHotSpotRange(int& hsStart, int& hsEnd);
517U525U 
518U526U    int CodePage() const;
  527A    int WrapCount(int line);
519U528U 
520U529U    virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) = 0;
521U530U 
51 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:33.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.