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

   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.


   Legend  

Unchanged lineExample of unchanged line
Modified lineExample of modified line
Added lineExample of added line
Removed lineExample of removed line
Ignored lineExample of ignored line

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