Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\AutoComplete.cxx
Last modified2003-04-29 12:01:04.001 +0200
Size3.8 Kb (185 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\AutoComplete.cxx
Last modified2006-03-16 13:07:02.000 +0100
Size3.6 Kb (175 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged7153
Inserted213
Deleted00
Ignored00
Changed441



   Comparison Details  

42 skipped lines
43U43U    return active;
44U44U}
45U45U 
46Cvoid AutoComplete::Start(Window &parent, int ctrlID, int position, 46Cvoid AutoComplete::Start(Window &parent, int ctrlID, 
  47C    int position, Point location, int startLen_, 
47C    int startLen_, int lineHeight, bool unicodeMode) { 48C    int lineHeight, bool unicodeMode) {
48U49U    if (active) {
49U50U        Cancel();
50U51U    }
51C    lb->Create(parent, ctrlID, lineHeight, unicodeMode); 52C    lb->Create(parent, ctrlID, location, lineHeight, unicodeMode);
52U53U    lb->Clear();
53U54U    active = true;
54U55U    startLen = startLen_;
35 skipped lines
90U91U}
91U92U 
92U93Uvoid AutoComplete::SetList(const char *list) {
93C    lb->Clear();  
94C    char *words = new char[strlen(list) + 1];  
95C    if (words) {  
96C        strcpy(words, list);  
97C        char *startword = words;  
98C        char *numword = NULL;  
99C        int i = 0;  
100C        for (; words && words[i]; i++) {  
101C        if (words[i] == separator) {  
102C        words[i] = '\0';  
103C        if (numword)  
104C        *numword = '\0';  
105C        lb->Append(startword, numword?atoi(numword + 1):-1);  
106C        startword = words + i + 1;  
107C        numword = NULL;  
108C        } else if (words[i] == typesep) { 94C    lb->SetList(listseparatortypesep);
109C        numword = words + i;  
110C        }  
111C        }  
112C        if (startword) {  
113C        if (numword)  
114C        *numword = '\0';  
115C        lb->Append(startword, numword?atoi(numword + 1):-1);  
116C        }  
117C        delete []words;  
118C    }  
119U95U}
120U96U 
121Cvoid AutoComplete::Show() { 97Cvoid AutoComplete::Show(bool show) {
122C    lb->Show(); 98C    lb->Show(show);
  99C    if (show)
123C    lb->Select(0); 100C        lb->Select(0);
124U101U}
125U102U 
126U103Uvoid AutoComplete::Cancel() {
127U104U    if (lb->Created()) {
  105A        lb->Clear();
128U106U        lb->Destroy();
129U107U        active = false;
130U108U    }
39 skipped lines
170U148U        --pivot;
171U149U        }
172U150U        location = pivot;
  151A        if (ignoreCase) {
  152A        // Check for exact-case match
  153A        for (; pivot <= end; pivot++) {
  154A        lb->GetValue(pivot, item, maxItemLen);
  155A        if (!strncmp(word, item, lenWord)) {
2 skipped lines
  158A        }
  159A        if (CompareNCaseInsensitive(word, item, lenWord))
  160A        break;
  161A        }
  162A        }
173U163U        } else if (cond < 0) {
174U164U        end = pivot - 1;
175U165U        } else if (cond > 0) {
10 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  

UExample of unchanged line
CExample of modified line
AExample of added line
RExample of removed line
IExample of ignored line
Modified text
Added text
Removed text

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