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. --- win32/ScintillaWin.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'win32/ScintillaWin.h') diff --git a/win32/ScintillaWin.h b/win32/ScintillaWin.h index cce72587d..c46e263de 100644 --- a/win32/ScintillaWin.h +++ b/win32/ScintillaWin.h @@ -8,12 +8,13 @@ #ifndef SCINTILLAWIN_H #define SCINTILLAWIN_H -class ScintillaWin; +namespace Scintilla::Internal { -namespace Scintilla { +class ScintillaWin; int ResourcesRelease(bool fromDllMain) noexcept; -sptr_t DirectFunction(ScintillaWin *sci, UINT iMessage, uptr_t wParam, sptr_t lParam); +int RegisterClasses(void *hInstance) noexcept; +Scintilla::sptr_t DirectFunction(ScintillaWin *sci, UINT iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam); } -- cgit v1.2.3