wxWidgets contrib src 2.6.2 - 2.6.3 monochrome

Compared files

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\LineMarker.cxx
Last modified	2003-04-29 12:01:04.001 +0200
Size	10.4 Kb (300 Lines)
Encoding	Latin 1 - ANSI (CP1252) default

Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\LineMarker.cxx
Last modified	2006-03-16 13:07:08.000 +0100
Size	10.5 Kb (302 Lines)
Encoding	Latin 1 - ANSI (CP1252) default

Comparison Statistics

Detailed Statistics

All Changes

		Blocks	Lines
Unchanged		3	299
Inserted		1	2
Deleted		0	0
Ignored		0	0
Changed		1	2

Comparison Details

281 skipped lines

282

U

282

U

surface->LineTo(right - 5, centreY + 5);

283

U

283

U

right += 4;

284

U

284

U

}

285

C

} else { // SC_MARK_SHORTARROW

285

C

} else if (markType == SC_MARK_SHORTARROW) {

286

U

286

U

Point pts[] = {

287

U

287

U

Point(centreX, centreY + dimOn2),

288

U

288

U

Point(centreX + dimOn2, centreY),

6 skipped lines

295

U

295

U

};

296

U

296

U

surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),

297

U

297

U

fore.allocated, back.allocated);

298

A

} else { // SC_MARK_FULLRECT

299

A

surface->FillRectangle(rcWhole, back.allocated);

298

U

300

U

}

299

U

301

U

}

300

U

302

U

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

U	Example of unchanged line
C	Example of modified line
A	Example of added line
R	Example of removed line
I	Example of ignored line
Modified text
Added text
Removed text

This report has been generated by Ellié Computing Merge on 2006-09-07 16:23:44.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.