From 92290868cf9753d2df0d494cb44e2ff62a570b58 Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 24 May 2021 19:31:06 +1000 Subject: Define C++ version of the Scintilla API in ScintillaTypes.h, ScintillaMessages.h and ScintillaStructures.h using scoped enumerations. Use these headers instead of Scintilla.h internally. External definitions go in the Scintilla namespace and internal definitio0ns in Scintilla::Internal. --- src/AutoComplete.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/AutoComplete.h') diff --git a/src/AutoComplete.h b/src/AutoComplete.h index c5b40ad14..c46530771 100644 --- a/src/AutoComplete.h +++ b/src/AutoComplete.h @@ -8,7 +8,7 @@ #ifndef AUTOCOMPLETE_H #define AUTOCOMPLETE_H -namespace Scintilla { +namespace Scintilla::Internal { /** */ @@ -32,14 +32,14 @@ public: bool cancelAtStartPos; bool autoHide; bool dropRestOfWord; - unsigned int ignoreCaseBehaviour; + Scintilla::CaseInsensitiveBehaviour ignoreCaseBehaviour; int widthLBDefault; int heightLBDefault; - /** SC_ORDER_PRESORTED: Assume the list is presorted; selection will fail if it is not alphabetical
- * SC_ORDER_PERFORMSORT: Sort the list alphabetically; start up performance cost for sorting
- * SC_ORDER_CUSTOM: Handle non-alphabetical entries; start up performance cost for generating a sorted lookup table + /** Ordering::PreSorted: Assume the list is presorted; selection will fail if it is not alphabetical
+ * Ordering::PerformSort: Sort the list alphabetically; start up performance cost for sorting
+ * Ordering::Custom: Handle non-alphabetical entries; start up performance cost for generating a sorted lookup table */ - int autoSort; + Scintilla::Ordering autoSort; AutoComplete(); ~AutoComplete(); @@ -49,7 +49,7 @@ public: /// Display the auto completion list positioned to be near a character position void Start(Window &parent, int ctrlID, Sci::Position position, Point location, - Sci::Position startLen_, int lineHeight, bool unicodeMode, int technology); + Sci::Position startLen_, int lineHeight, bool unicodeMode, Scintilla::Technology technology); /// The stop chars are characters which, when typed, cause the auto completion list to disappear void SetStopChars(const char *stopChars_); -- cgit v1.2.3