Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\ScintillaWX.h
Last modified2005-03-31 17:43:46.001 +0200
Size5.5 Kb (194 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\ScintillaWX.h
Last modified2006-03-16 13:06:58.001 +0100
Size5.6 Kb (197 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged6192
Inserted33
Deleted00
Ignored00
Changed24



   Comparison Details  

8 skipped lines
9U9U// Author:      Robin Dunn
10U10U//
11U11U// Created:     13-Jan-2000
12C// RCS-ID:      $Id: ScintillaWX.h,v 1.27 2005/03/30 18:39:53 RD Exp $ 12C// RCS-ID:      $Id: ScintillaWX.h,v 1.27.2.1 2006/03/12 06:03:52 RD Exp $
13U13U// Copyright:   (c) 2000 by Total Control Software
14U14U// Licence:     wxWindows license
15U15U/////////////////////////////////////////////////////////////////////////////
126 skipped lines
142U142U    int  DoKeyDown(const wxKeyEvent& event, bool* consumed);
143U143U    void DoTick() { Tick(); }
144U144U    void DoOnIdle(wxIdleEvent& evt);
  145A    void DoStartDrag();
145U146U 
146U147U#if wxUSE_DRAG_AND_DROP
147U148U    bool DoDropText(long x, long y, const wxString& data);
25 skipped lines
173U174U#if wxUSE_DRAG_AND_DROP
174U175U    wxSTCDropTarget*    dropTarget;
175U176U    wxDragResult        dragResult;
  177A    wxTimer*            startDragTimer;
176U178U#endif
  179A 
177U180U    int                 wheelRotation;
178U181U 
179U182U    // For use in creating a system caret
5 skipped lines
185U188U    int sysCaretWidth;
186U189U    int sysCaretHeight;
187U190U#endif
188C      191C    
189U192U    friend class wxSTCCallTip;
190U193U};
191U194U 
3 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:46.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.