WinCE doesn't have GetThreadLocale

[wxWidgets.git] / src / stc / scintilla / src / AutoComplete.cxx

diff --git a/src/stc/scintilla/src/AutoComplete.cxx b/src/stc/scintilla/src/AutoComplete.cxx
index 48aaee38ae75cbb7d598f24184a076db443aec76..adbd24d038fa5cdc6def23578b7c1ced63ad868e 100644 (file)
--- a/src/stc/scintilla/src/AutoComplete.cxx
+++ b/src/stc/scintilla/src/AutoComplete.cxx
@@ -2,7 +2,7 @@
 /** @file AutoComplete.cxx
  ** Defines the auto completion list box.
  **/
 /** @file AutoComplete.cxx
  ** Defines the auto completion list box.
  **/

-// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>

 // The License.txt file describes the conditions under which this software may be distributed.
 
 #include <stdlib.h>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #include <stdlib.h>


@@ -14,33 +14,42 @@
 #include "PropSet.h"
 #include "AutoComplete.h"
 
 #include "PropSet.h"
 #include "AutoComplete.h"
 

-AutoComplete::AutoComplete() : 
+AutoComplete::AutoComplete() :

        active(false),
        separator(' '),
        active(false),
        separator(' '),

+       typesep('?'),

        ignoreCase(false),
        chooseSingle(false),
        ignoreCase(false),
        chooseSingle(false),

+       lb(0),

        posStart(0),
        startLen(0),
        cancelAtStartPos(true),
        autoHide(true),
        dropRestOfWord(false)   {
        posStart(0),
        startLen(0),
        cancelAtStartPos(true),
        autoHide(true),
        dropRestOfWord(false)   {

+       lb = ListBox::Allocate();

        stopChars[0] = '\0';
        fillUpChars[0] = '\0';
 }
 
 AutoComplete::~AutoComplete() {
        stopChars[0] = '\0';
        fillUpChars[0] = '\0';
 }
 
 AutoComplete::~AutoComplete() {

-       lb.Destroy();
+       if (lb) {
+               lb->Destroy();
+               delete lb;
+               lb = 0;
+       }

 }
 
 bool AutoComplete::Active() {
        return active;
 }
 
 }
 
 bool AutoComplete::Active() {
        return active;
 }
 

-void AutoComplete::Start(Window &parent, int ctrlID, int position, int startLen_) {
-       if (!lb.Created()) {
-               lb.Create(parent, ctrlID);
+void AutoComplete::Start(Window &parent, int ctrlID, int position,
+       int startLen_, int lineHeight, bool unicodeMode) {
+       if (active) {
+               Cancel();

        }
        }

-       lb.Clear();
+       lb->Create(parent, ctrlID, lineHeight, unicodeMode);
+       lb->Clear();

        active = true;
        startLen = startLen_;
        posStart = position;
        active = true;
        startLen = startLen_;
        posStart = position;


@@ -63,7 +72,7 @@ void AutoComplete::SetFillUpChars(const char *fillUpChars_) {
 bool AutoComplete::IsFillUpChar(char ch) {
        return ch && strchr(fillUpChars, ch);
 }
 bool AutoComplete::IsFillUpChar(char ch) {
        return ch && strchr(fillUpChars, ch);
 }

- 
+

 void AutoComplete::SetSeparator(char separator_) {
        separator = separator_;
 }
 void AutoComplete::SetSeparator(char separator_) {
        separator = separator_;
 }


@@ -72,61 +81,77 @@ char AutoComplete::GetSeparator() {
        return separator;
 }
 
        return separator;
 }
 

+void AutoComplete::SetTypesep(char separator_) {
+       typesep = separator_;
+}
+
+char AutoComplete::GetTypesep() {
+       return typesep;
+}
+

 void AutoComplete::SetList(const char *list) {
 void AutoComplete::SetList(const char *list) {

-       lb.Clear();
+       lb->Clear();

        char *words = new char[strlen(list) + 1];
        if (words) {
                strcpy(words, list);
                char *startword = words;
        char *words = new char[strlen(list) + 1];
        if (words) {
                strcpy(words, list);
                char *startword = words;

+               char *numword = NULL;

                int i = 0;
                for (; words && words[i]; i++) {
                        if (words[i] == separator) {
                                words[i] = '\0';
                int i = 0;
                for (; words && words[i]; i++) {
                        if (words[i] == separator) {
                                words[i] = '\0';

-                               lb.Append(startword);
+                               if (numword)
+                                       *numword = '\0';
+                               lb->Append(startword, numword?atoi(numword + 1):-1);

                                startword = words + i + 1;
                                startword = words + i + 1;

+                               numword = NULL;
+                       } else if (words[i] == typesep) {
+                               numword = words + i;

                        }
                }
                if (startword) {
                        }
                }
                if (startword) {

-                       lb.Append(startword);
+                       if (numword)
+                               *numword = '\0';
+                       lb->Append(startword, numword?atoi(numword + 1):-1);

                }
                delete []words;
        }
 }
 
 void AutoComplete::Show() {
                }
                delete []words;
        }
 }
 
 void AutoComplete::Show() {

-       lb.Show();
-       lb.Select(0);
+       lb->Show();
+       lb->Select(0);

 }
 
 void AutoComplete::Cancel() {
 }
 
 void AutoComplete::Cancel() {

-       if (lb.Created()) {
-               lb.Destroy();
+       if (lb->Created()) {
+               lb->Destroy();

                active = false;
        }
 }
 
 
 void AutoComplete::Move(int delta) {
                active = false;
        }
 }
 
 
 void AutoComplete::Move(int delta) {

-       int count = lb.Length();
-       int current = lb.GetSelection();
+       int count = lb->Length();
+       int current = lb->GetSelection();

        current += delta;
        if (current >= count)
                current = count - 1;
        if (current < 0)
                current = 0;
        current += delta;
        if (current >= count)
                current = count - 1;
        if (current < 0)
                current = 0;

-       lb.Select(current);
+       lb->Select(current);

 }
 
 void AutoComplete::Select(const char *word) {
 }
 
 void AutoComplete::Select(const char *word) {

-       int lenWord = strlen(word);
+       size_t lenWord = strlen(word);

        int location = -1;
        const int maxItemLen=1000;
        char item[maxItemLen];
        int start = 0; // lower bound of the api array block to search
        int location = -1;
        const int maxItemLen=1000;
        char item[maxItemLen];
        int start = 0; // lower bound of the api array block to search

-       int end = lb.Length() - 1; // upper bound of the api array block to search
+       int end = lb->Length() - 1; // upper bound of the api array block to search

        while ((start <= end) && (location == -1)) { // Binary searching loop
                int pivot = (start + end) / 2;
        while ((start <= end) && (location == -1)) { // Binary searching loop
                int pivot = (start + end) / 2;

-               lb.GetValue(pivot, item, maxItemLen);
+               lb->GetValue(pivot, item, maxItemLen);

                int cond;
                if (ignoreCase)
                        cond = CompareNCaseInsensitive(word, item, lenWord);
                int cond;
                if (ignoreCase)
                        cond = CompareNCaseInsensitive(word, item, lenWord);


@@ -135,7 +160,7 @@ void AutoComplete::Select(const char *word) {
                if (!cond) {
                        // Find first match
                        while (pivot > start) {
                if (!cond) {
                        // Find first match
                        while (pivot > start) {

-                               lb.GetValue(pivot-1, item, maxItemLen);
+                               lb->GetValue(pivot-1, item, maxItemLen);

                                if (ignoreCase)
                                        cond = CompareNCaseInsensitive(word, item, lenWord);
                                else
                                if (ignoreCase)
                                        cond = CompareNCaseInsensitive(word, item, lenWord);
                                else


@@ -154,6 +179,6 @@ void AutoComplete::Select(const char *word) {
        if (location == -1 && autoHide)
                Cancel();
        else
        if (location == -1 && autoHide)
                Cancel();
        else

-               lb.Select(location);
+               lb->Select(location);

 }
 
 }