Compared folders  

Left
C:\SDK\wxWidgets-2.6.2\contrib\include\wx
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\include\wx
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Global Statistics

Files and FoldersBetween Left and Right
Unchanged23
Inserted0
Deleted0
ChangedAll files*1
Text files1
Binary files0
*The sum "All files" may be greater than the actual sum of the number per file type, indeed, the files designated as different by metadata-based rules (size, date...) are not open and their type is not determined in order to accelerate the differentiation process.

This folder cannot be merged automatically. There is 1 conflict concerning files to solve manually.

Detailed Statistics for Text Files

All Changes
 BlocksLines
Unchanged343209
Inserted23305
Deleted12
Ignored00
Changed936



   Comparison Details  

LeftChange CountRight
wx
1
wx
animate
 
animate
animate.h
(11.8 Kb)
 
animate.h
(11.8 Kb)
applet
 
applet
applet.h
(2.6 Kb)
 
applet.h
(2.6 Kb)
echovar.h
(4.9 Kb)
 
echovar.h
(4.9 Kb)
ifelsevar.h
(4.9 Kb)
 
ifelsevar.h
(4.9 Kb)
loadpage.h
(3.8 Kb)
 
loadpage.h
(3.8 Kb)
plugin.h
(1.9 Kb)
 
plugin.h
(1.9 Kb)
prepecho.h
(1.9 Kb)
 
prepecho.h
(1.9 Kb)
prepifelse.h
(1.9 Kb)
 
prepifelse.h
(1.9 Kb)
prepinclude.h
(2.1 Kb)
 
prepinclude.h
(2.1 Kb)
window.h
(7.4 Kb)
 
window.h
(7.4 Kb)
deprecated
0
deprecated
expr.h
(1.6 Kb)
0
expr.h
(1.6 Kb)
prop.h
(10.8 Kb)
 
prop.h
(10.8 Kb)
propform.h
(11.5 Kb)
 
propform.h
(11.5 Kb)
proplist.h
(22.2 Kb)
 
proplist.h
(22.2 Kb)
resource.h
(8.9 Kb)
0
resource.h
(8.9 Kb)
setup.h
(1.9 Kb)
 
setup.h
(1.9 Kb)
tbarsmpl.h
(6.1 Kb)
 
tbarsmpl.h
(6.1 Kb)
treelay.h
(4.7 Kb)
 
treelay.h
(4.7 Kb)
wxexpr.h
(9.8 Kb)
0
wxexpr.h
(9.8 Kb)
fl
0
fl
antiflickpl.h
(2.1 Kb)
 
antiflickpl.h
(2.1 Kb)
bardragpl.h
(5.3 Kb)
 
bardragpl.h
(5.3 Kb)
barhintspl.h
(3.5 Kb)
 
barhintspl.h
(3.5 Kb)
cbcustom.h
(1.5 Kb)
 
cbcustom.h
(1.5 Kb)
controlbar.h
(69.3 Kb)
0
controlbar.h
(69.3 Kb)
dynbarhnd.h
(665 Bytes)
 
dynbarhnd.h
(665 Bytes)
dyntbar.h
(8.6 Kb)
 
dyntbar.h
(8.6 Kb)
dyntbarhnd.h
(1 Kb)
 
dyntbarhnd.h
(1 Kb)
fldefs.h
(1.3 Kb)
 
fldefs.h
(1.3 Kb)
frmview.h
(3.3 Kb)
 
frmview.h
(3.3 Kb)
garbagec.h
(2.1 Kb)
 
garbagec.h
(2.1 Kb)
gcupdatesmgr.h
(3.9 Kb)
 
gcupdatesmgr.h
(3.9 Kb)
hintanimpl.h
(3.4 Kb)
 
hintanimpl.h
(3.4 Kb)
newbmpbtn.h
(6.6 Kb)
 
newbmpbtn.h
(6.6 Kb)
panedrawpl.h
(5.5 Kb)
 
panedrawpl.h
(5.5 Kb)
rowdragpl.h
(7.1 Kb)
 
rowdragpl.h
(7.1 Kb)
rowlayoutpl.h
(3.9 Kb)
 
rowlayoutpl.h
(3.9 Kb)
toolwnd.h
(7.7 Kb)
0
toolwnd.h
(7.7 Kb)
updatesmgr.h
(2.3 Kb)
 
updatesmgr.h
(2.3 Kb)
foldbar
0
foldbar
captionbar.h
(16.3 Kb)
0
captionbar.h
(16.3 Kb)
doc_mainpage.h
(4 Kb)
 
doc_mainpage.h
(4 Kb)
foldpanelbar.h
(13.3 Kb)
0
foldpanelbar.h
(13.3 Kb)
foldpanelitem.h
(7.4 Kb)
0
foldpanelitem.h
(7.4 Kb)
gizmos
0
gizmos
dynamicsash.h
(8 Kb)
0
dynamicsash.h
(8 Kb)
editlbox.h
(2.2 Kb)
0
editlbox.h
(2.2 Kb)
gizmos.h
(478 Bytes)
0
gizmos.h
(478 Bytes)
ledctrl.h
(2.2 Kb)
 
ledctrl.h
(2.2 Kb)
multicell.h
(5.7 Kb)
0
multicell.h
(5.7 Kb)
splittree.h
(6.2 Kb)
 
splittree.h
(6.2 Kb)
statpict.h
(3.2 Kb)
0
statpict.h
(3.2 Kb)
xh_statpict.h
(1.1 Kb)
0
xh_statpict.h
(1.1 Kb)
mmedia
0
mmedia
cdbase.h
(2.1 Kb)
 
cdbase.h
(2.1 Kb)
cdunix.h
(1.3 Kb)
 
cdunix.h
(1.3 Kb)
cdwin.h
(1.3 Kb)
 
cdwin.h
(1.3 Kb)
defs.h
(448 Bytes)
 
defs.h
(448 Bytes)
internal
 
internal
g72x.h
(4 Kb)
 
g72x.h
(4 Kb)
sndaiff.h
(1.2 Kb)
 
sndaiff.h
(1.2 Kb)
sndbase.h
(5.4 Kb)
0
sndbase.h
(5.4 Kb)
sndcodec.h
(829 Bytes)
 
sndcodec.h
(829 Bytes)
sndcpcm.h
(1.4 Kb)
 
sndcpcm.h
(1.4 Kb)
sndesd.h
(1.5 Kb)
0
sndesd.h
(1.5 Kb)
sndfile.h
(4 Kb)
0
sndfile.h
(4 Kb)
sndg72x.h
(2.1 Kb)
 
sndg72x.h
(2.1 Kb)
sndmsad.h
(2.8 Kb)
 
sndmsad.h
(2.8 Kb)
sndoss.h
(1.3 Kb)
 
sndoss.h
(1.3 Kb)
sndpcm.h
(1.5 Kb)
 
sndpcm.h
(1.5 Kb)
sndulaw.h
(1.6 Kb)
 
sndulaw.h
(1.6 Kb)
sndwav.h
(2.1 Kb)
0
sndwav.h
(2.1 Kb)
sndwin.h
(1.8 Kb)
 
sndwin.h
(1.8 Kb)
vidbase.h
(3.2 Kb)
 
vidbase.h
(3.2 Kb)
vidwin.h
(2.9 Kb)
 
vidwin.h
(2.9 Kb)
vidxanm.h
(3.6 Kb)
0
vidxanm.h
(3.6 Kb)
net
0
net
email.h
(1 Kb)
0
email.h
(1 Kb)
msg.h
(2.5 Kb)
 
msg.h
(2.5 Kb)
smapi.h
(1.3 Kb)
 
smapi.h
(1.3 Kb)
web.h
(712 Bytes)
 
web.h
(712 Bytes)
ogl
0
ogl
basic.h
(29.3 Kb)
0
basic.h
(29.3 Kb)
basicp.h
(7.4 Kb)
 
basicp.h
(7.4 Kb)
bmpshape.h
(1.2 Kb)
 
bmpshape.h
(1.2 Kb)
canvas.h
(3.1 Kb)
 
canvas.h
(3.1 Kb)
composit.h
(8.3 Kb)
 
composit.h
(8.3 Kb)
constrnt.h
(2.7 Kb)
 
constrnt.h
(2.7 Kb)
divided.h
(1.8 Kb)
 
divided.h
(1.8 Kb)
drawn.h
(8.3 Kb)
 
drawn.h
(8.3 Kb)
drawnp.h
(6.1 Kb)
 
drawnp.h
(6.1 Kb)
lines.h
(12.1 Kb)
 
lines.h
(12.1 Kb)
linesp.h
(2.7 Kb)
 
linesp.h
(2.7 Kb)
mfutils.h
(9.4 Kb)
 
mfutils.h
(9.4 Kb)
misc.h
(4.8 Kb)
0
misc.h
(4.8 Kb)
ogl.h
(1.3 Kb)
 
ogl.h
(1.3 Kb)
ogldiag.h
(3.7 Kb)
 
ogldiag.h
(3.7 Kb)
plot
0
plot
plot.h
(22.2 Kb)
0
plot.h
(22.2 Kb)
plot_dwn.bmp
(334 Bytes)
 
plot_dwn.bmp
(334 Bytes)
plot_dwn.xpm
(655 Bytes)
 
plot_dwn.xpm
(655 Bytes)
plot_enl.bmp
(358 Bytes)
 
plot_enl.bmp
(358 Bytes)
plot_enl.xpm
(703 Bytes)
 
plot_enl.xpm
(703 Bytes)
plot_shr.bmp
(358 Bytes)
 
plot_shr.bmp
(358 Bytes)
plot_shr.xpm
(703 Bytes)
 
plot_shr.xpm
(703 Bytes)
plot_up.bmp
(334 Bytes)
 
plot_up.bmp
(334 Bytes)
plot_up.xpm
(654 Bytes)
 
plot_up.xpm
(654 Bytes)
plot_zin.bmp
(334 Bytes)
 
plot_zin.bmp
(334 Bytes)
plot_zin.xpm
(655 Bytes)
 
plot_zin.xpm
(655 Bytes)
plot_zot.bmp
(334 Bytes)
 
plot_zot.bmp
(334 Bytes)
plot_zot.xpm
(655 Bytes)
 
plot_zot.xpm
(655 Bytes)
wxplot.rc
(347 Bytes)
 
wxplot.rc
(347 Bytes)
stc
1
stc
(107.7 Kb)
33
(117.2 Kb)
svg
 
svg
dcsvg.h
(10.2 Kb)
 
dcsvg.h
(10.2 Kb)

   Comparison Options  

DepthAll folders are compared recursively
Size-based criteriaDifferent file sizes mean different files
Equal file sizes mean equal files
Date-based criteriaDifferent dates mean different files
Equal dates mean equal files
(Only if sizes are equal)
File system precisionCompensate file system precision loss
Fixed difference (60 minutes)

Filters Options

File Name Filters
Exclude patterns*.txt

File Status Filters
Hide files or folders missingin left hierarchy
in right hierarchy
Other hidden itemsSystem hidden files and folders
Identical folders with no content shown

File Date Filters
Use dates to hide files modifiedbefore 2005-01-01 00:00:00.001 +0100
Only hide a file if it exists everywhere

Display Options

Show file sizeyes
Show file dateyes
Show changes countyes

   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.



   Sub-Comparison Report  

   Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\include\wx\stc\stc.h
Last modified2005-04-20 19:16:38.001 +0200
Size107.7 Kb (3227 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\include\wx\stc\stc.h
Last modified2006-03-16 13:06:44.001 +0100
Size117.2 Kb (3534 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged343209
Inserted23305
Deleted12
Ignored00
Changed936



   Comparison Details  

11 skipped lines
12 12 // Author:      Robin Dunn
13 13 //
14 14 // Created:     13-Jan-2000
15 // RCS-ID:      $Id: stc.h,v 1.68 2005/04/19 22:30:40 RD Exp $ 15 // RCS-ID:      $Id: stc.h,v 1.68.2.2 2006/03/12 06:03:57 RD Exp $
16 16 // Copyright:   (c) 2000 by Total Control Software
17 17 // Licence:     wxWindows license
18 18 /////////////////////////////////////////////////////////////////////////////
2 skipped lines
21 21 #define __stc_h__
22 22  
23 23  
24 #include <wx/wx.h> 24 #include "wx/wx.h"
25 #include <wx/dnd.h> 25 #include "wx/dnd.h"
26 26  
27 27  
28 28 #ifdef WXMAKINGDLL_STC
77 skipped lines
106 106 #define wxSTC_MARK_DOTDOTDOT 23
107 107 #define wxSTC_MARK_ARROWS 24
108 108 #define wxSTC_MARK_PIXMAP 25
  109 #define wxSTC_MARK_FULLRECT 26
109 110 #define wxSTC_MARK_CHARACTER 10000
110 111  
111 112 // Markers used for outlining column.
32 skipped lines
144 145 #define wxSTC_CHARSET_MAC 77
145 146 #define wxSTC_CHARSET_OEM 255
146 147 #define wxSTC_CHARSET_RUSSIAN 204
  148 #define wxSTC_CHARSET_CYRILLIC 1251
147 149 #define wxSTC_CHARSET_SHIFTJIS 128
148 150 #define wxSTC_CHARSET_SYMBOL 2
149 151 #define wxSTC_CHARSET_TURKISH 162
2 skipped lines
152 154 #define wxSTC_CHARSET_ARABIC 178
153 155 #define wxSTC_CHARSET_VIETNAMESE 163
154 156 #define wxSTC_CHARSET_THAI 222
  157 #define wxSTC_CHARSET_8859_15 1000
155 158 #define wxSTC_CASE_MIXED 0
156 159 #define wxSTC_CASE_UPPER 1
157 160 #define wxSTC_CASE_LOWER 2
46 skipped lines
204 207 #define wxSTC_TIME_FOREVER 10000000
205 208 #define wxSTC_WRAP_NONE 0
206 209 #define wxSTC_WRAP_WORD 1
  210 #define wxSTC_WRAP_CHAR 2
207 211 #define wxSTC_WRAPVISUALFLAG_NONE 0x0000
208 212 #define wxSTC_WRAPVISUALFLAG_END 0x0001
209 213 #define wxSTC_WRAPVISUALFLAG_START 0x0002
59 skipped lines
269 273 #define wxSTC_PERFORMED_USER 0x10
270 274 #define wxSTC_PERFORMED_UNDO 0x20
271 275 #define wxSTC_PERFORMED_REDO 0x40
  276 #define wxSTC_MULTISTEPUNDOREDO 0x80
272 277 #define wxSTC_LASTSTEPINUNDOREDO 0x100
273 278 #define wxSTC_MOD_CHANGEMARKER 0x200
274 279 #define wxSTC_MOD_BEFOREINSERT 0x400
275 280 #define wxSTC_MOD_BEFOREDELETE 0x800
  281 #define wxSTC_MULTILINEUNDOREDO 0x1000
276 #define wxSTC_MODEVENTMASKALL 0xF77 282 #define wxSTC_MODEVENTMASKALL 0x1FFF
277 283  
278 284 // Symbolic key codes and modifier flags.
279 285 // ASCII and other printable characters below 256.
15 skipped lines
295 301 #define wxSTC_KEY_ADD 310
296 302 #define wxSTC_KEY_SUBTRACT 311
297 303 #define wxSTC_KEY_DIVIDE 312
  304 #define wxSTC_SCMOD_NORM 0
298 305 #define wxSTC_SCMOD_SHIFT 1
299 306 #define wxSTC_SCMOD_CTRL 2
300 307 #define wxSTC_SCMOD_ALT 4
28 skipped lines
329 336 #define wxSTC_LEX_NNCRONTAB 26
330 337 #define wxSTC_LEX_BULLANT 27
331 338 #define wxSTC_LEX_VBSCRIPT 28
332 #define wxSTC_LEX_ASP 29  
333 #define wxSTC_LEX_PHP 30  
334 339 #define wxSTC_LEX_BAAN 31
335 340 #define wxSTC_LEX_MATLAB 32
336 341 #define wxSTC_LEX_SCRIPTOL 33
28 skipped lines
365 370 #define wxSTC_LEX_BASH 62
366 371 #define wxSTC_LEX_ASN1 63
367 372 #define wxSTC_LEX_VHDL 64
  373 #define wxSTC_LEX_CAML 65
  374 #define wxSTC_LEX_BLITZBASIC 66
  375 #define wxSTC_LEX_PUREBASIC 67
  376 #define wxSTC_LEX_HASKELL 68
  377 #define wxSTC_LEX_PHPSCRIPT 69
5 skipped lines
  383 #define wxSTC_LEX_FREEBASIC 75
  384  
  385 // These are deprecated, STC_LEX_HTML should be used instead.
  386 #define wxSTC_LEX_ASP 29
  387 #define wxSTC_LEX_PHP 30
368 388  
369 389 // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
370 390 // value assigned in sequence from SCLEX_AUTOMATIC+1.
14 skipped lines
385 405 #define wxSTC_P_IDENTIFIER 11
386 406 #define wxSTC_P_COMMENTBLOCK 12
387 407 #define wxSTC_P_STRINGEOL 13
  408 #define wxSTC_P_WORD2 14
  409 #define wxSTC_P_DECORATOR 15
388 410  
389 411 // Lexical states for SCLEX_CPP
390 412 #define wxSTC_C_DEFAULT 0
171 skipped lines
562 584 #define wxSTC_PL_ARRAY 13
563 585 #define wxSTC_PL_HASH 14
564 586 #define wxSTC_PL_SYMBOLTABLE 15
  587 #define wxSTC_PL_VARIABLE_INDEXER 16