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/CallTip.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/CallTip.h') diff --git a/src/CallTip.h b/src/CallTip.h index 998bdabf5..f2889d44a 100644 --- a/src/CallTip.h +++ b/src/CallTip.h @@ -8,7 +8,7 @@ #ifndef CALLTIP_H #define CALLTIP_H -namespace Scintilla { +namespace Scintilla::Internal { struct Chunk { size_t start; @@ -30,7 +30,7 @@ class CallTip { int lineHeight; // vertical line spacing int offsetMain; // The alignment point of the call tip int tabSize; // Tab size in pixels, <=0 no TAB expand - bool useStyleCallTip; // if true, STYLE_CALLTIP should be used + bool useStyleCallTip; // if true, StyleCallTip should be used bool above; // if true, display calltip above text int DrawChunk(Surface *surface, int x, std::string_view sv, @@ -72,7 +72,7 @@ public: /// Setup the calltip and return a rectangle of the area required. PRectangle CallTipStart(Sci::Position pos, Point pt, int textHeight, const char *defn, const char *faceName, int size, int codePage_, - int characterSet, int technology, const char *localeName, + Scintilla::CharacterSet characterSet, Scintilla::Technology technology, const char *localeName, const Window &wParent); void CallTipCancel(); -- cgit v1.2.3