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
9 9 // Author:      Robin Dunn
10 10 //
11 11 // Created:     13-Jan-2000
12 // RCS-ID:      $Id: ScintillaWX.h,v 1.27 2005/03/30 18:39:53 RD Exp $ 12 // RCS-ID:      $Id: ScintillaWX.h,v 1.27.2.1 2006/03/12 06:03:52 RD Exp $
13 13 // Copyright:   (c) 2000 by Total Control Software
14 14 // Licence:     wxWindows license
15 15 /////////////////////////////////////////////////////////////////////////////
126 skipped lines
142 142     int  DoKeyDown(const wxKeyEvent& event, bool* consumed);
143 143     void DoTick() { Tick(); }
144 144     void DoOnIdle(wxIdleEvent& evt);
  145     void DoStartDrag();
145 146  
146 147 #if wxUSE_DRAG_AND_DROP
147 148     bool DoDropText(long x, long y, const wxString& data);
25 skipped lines
173 174 #if wxUSE_DRAG_AND_DROP
174 175     wxSTCDropTarget*    dropTarget;
175 176     wxDragResult        dragResult;
  177     wxTimer*            startDragTimer;
176 178 #endif
  179  
177 180     int                 wheelRotation;
178 181  
179 182     // For use in creating a system caret
5 skipped lines
185 188     int sysCaretWidth;
186 189     int sysCaretHeight;
187 190 #endif
188       191     
189 192     friend class wxSTCCallTip;
190 193 };
191 194  
3 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:36.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.