wxWidgets contrib src 2.6.2 - 2.6.3 monochrome

Compared files

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\include\KeyWords.h
Last modified	2003-09-18 18:28:18.000 +0200
Size	2.5 Kb (75 Lines)
Encoding	Latin 1 - ANSI (CP1252) default

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

Comparison Statistics

Detailed Statistics

All Changes

		Blocks	Lines
Unchanged		4	72
Inserted		2	3
Deleted		0	0
Ignored		0	0
Changed		1	11

Comparison Details

19 skipped lines

20

U

20

U

LexerFunction fnLexer;

21

U

21

U

LexerFunction fnFolder;

22

U

22

U

const char * const * wordListDescriptions;

23

A

int styleBits;

23

U

24

U

24

U

25

U

static const LexerModule *base;

25

U

26

U

static int nextLanguage;

26

U

27

U

27

U

28

U

public:

28

U

29

U

const char *languageName;

29

C

LexerModule(int language_, LexerFunction fnLexer_,

30

C

LexerModule(int language_,

31

C

LexerFunction fnLexer_,

30

C

const char *languageName_=0, LexerFunction fnFolder_=0,

32

C

const char *languageName_=0,

33

C

LexerFunction fnFolder_=0,

31

C

const char * const wordListDescriptions_[] = NULL);

34

C

const char * const wordListDescriptions_[] = NULL,

35

C

int styleBits_=5);

36

C

virtual ~LexerModule() {

37

C

}

32

U

38

U

int GetLanguage() const { return language; }

33

U

39

U

34

U

40

U

// -1 is returned if no WordList information is available

35

U

41

U

int GetNumWordLists() const;

36

U

42

U

const char *GetWordListDescription(int index) const;

37

U

43

U

44

A

int GetStyleBitsNeeded() const;

45

A

38

U

46

U

virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,

39

U

47

U

WordList *keywordlists[], Accessor &styler) const;

40

U

48

U

virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,

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