wxWidgets contrib src 2.6.2 - 2.6.3 monochrome

Compared files

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\include\SString.h
Last modified	2004-09-28 13:17:22.000 +0200
Size	8.1 Kb (281 Lines)
Encoding	Latin 1 - ANSI (CP1252) default

Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\include\SString.h
Last modified	2006-03-16 13:07:02.000 +0100
Size	8.2 Kb (281 Lines)
Encoding	Latin 1 - ANSI (CP1252) default

Comparison Statistics

Detailed Statistics

All Changes

		Blocks	Lines
Unchanged		3	279
Inserted		0	0
Deleted		0	0
Ignored		0	0
Changed		2	4

Comparison Details

196 skipped lines

197

U

197

U

bool operator!=(const char *sOther) const {

198

U

198

U

return !operator==(sOther);

199

U

199

U

}

200

C

bool contains(char ch) {

200

C

bool contains(char ch) const {

201

U

201

U

return (s && *s) ? strchr(s, ch) != 0 : false;

202

U

202

U

}

203

U

203

U

void setsizegrowth(lenpos_t sizeGrowth_) {

49 skipped lines

253

U

253

U

bool startswith(const char *prefix);

254

U

254

U

bool endswith(const char *suffix);

255

U

255

U

int search(const char *sFind, lenpos_t start=0) const;

256

C

bool contains(const char *sFind) {

256

C

bool contains(const char *sFind) const {

257

U

257

U

return search(sFind) >= 0;

258

U

258

U

}

259

U

259

U

int substitute(char chFind, char chReplace);

22 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

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:29.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.