diff options
Diffstat (limited to 'src/ScintillaBase.h')
| -rw-r--r-- | src/ScintillaBase.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h index d62162196..47e24796d 100644 --- a/src/ScintillaBase.h +++ b/src/ScintillaBase.h @@ -8,7 +8,7 @@ #ifndef SCINTILLABASE_H #define SCINTILLABASE_H -namespace Scintilla { +namespace Scintilla::Internal { class LexState; /** @@ -29,15 +29,15 @@ protected: idcmdSelectAll=16 }; - int displayPopupMenu; + Scintilla::PopUp displayPopupMenu; Menu popup; - AutoComplete ac; + Scintilla::Internal::AutoComplete ac; CallTip ct; int listType; ///< 0 is an autocomplete list int maxListWidth; /// Maximum width of list, in average character widths - int multiAutoCMode; /// Mode for autocompleting when multiple selections are present + Scintilla::MultiAutoComplete multiAutoCMode; /// Mode for autocompleting when multiple selections are present LexState *DocumentLexState(); void Colourise(int start, int end); @@ -52,10 +52,10 @@ protected: void Initialise() override {} void Finalise() override; - void InsertCharacter(std::string_view sv, CharacterSource charSource) override; + void InsertCharacter(std::string_view sv, Scintilla::CharacterSource charSource) override; void Command(int cmdId); void CancelModes() override; - int KeyCommand(unsigned int iMessage) override; + int KeyCommand(Scintilla::Message iMessage) override; void AutoCompleteInsert(Sci::Position startPos, Sci::Position removeLen, const char *text, Sci::Position textLen); void AutoCompleteStart(Sci::Position lenEntered, const char *list); @@ -65,7 +65,7 @@ protected: int AutoCompleteGetCurrentText(char *buffer) const; void AutoCompleteCharacterAdded(char ch); void AutoCompleteCharacterDeleted(); - void AutoCompleteCompleted(char ch, unsigned int completionMethod); + void AutoCompleteCompleted(char ch, Scintilla::CompletionMethods completionMethod); void AutoCompleteMoveToCurrentWord(); void AutoCompleteSelection(); void ListNotify(ListBoxEvent *plbe) override; @@ -78,8 +78,8 @@ protected: bool ShouldDisplayPopup(Point ptInWindowCoordinates) const; void ContextMenu(Point pt); - void ButtonDownWithModifiers(Point pt, unsigned int curTime, int modifiers) override; - void RightButtonDownWithModifiers(Point pt, unsigned int curTime, int modifiers) override; + void ButtonDownWithModifiers(Point pt, unsigned int curTime, Scintilla::KeyMod modifiers) override; + void RightButtonDownWithModifiers(Point pt, unsigned int curTime, Scintilla::KeyMod modifiers) override; void NotifyStyleToNeeded(Sci::Position endStyleNeeded) override; void NotifyLexerChanged(Document *doc, void *userData) override; @@ -88,7 +88,7 @@ public: ~ScintillaBase() override; // Public so scintilla_send_message can use it - sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; + Scintilla::sptr_t WndProc(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam) override; }; } |