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.

1 files changed, 7 insertions, 5 deletions

diff --git a/win32/ScintillaDLL.cxx b/win32/ScintillaDLL.cxx
index 1ecf1c16e..3e448d848 100644
--- a/win32/ScintillaDLL.cxx
+++ b/win32/ScintillaDLL.cxx
@@ -11,24 +11,26 @@
 #define WINVER 0x0500
 #include <windows.h>
 
-#include "Scintilla.h"
+#include "ScintillaTypes.h"
 #include "ScintillaWin.h"
 
+using namespace Scintilla;
+
 extern "C"
 __declspec(dllexport)
 sptr_t __stdcall Scintilla_DirectFunction(
-    ScintillaWin *sci, UINT iMessage, uptr_t wParam, sptr_t lParam) {
-	return Scintilla::DirectFunction(sci, iMessage, wParam, lParam);
+    Internal::ScintillaWin *sci, UINT iMessage, uptr_t wParam, sptr_t lParam) {
+	return Internal::DirectFunction(sci, iMessage, wParam, lParam);
 }
 
 extern "C" int APIENTRY DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpvReserved) {
 	//Platform::DebugPrintf("Scintilla::DllMain %d %d\n", hInstance, dwReason);
 	if (dwReason == DLL_PROCESS_ATTACH) {
-		if (!Scintilla_RegisterClasses(hInstance))
+		if (!Internal::RegisterClasses(hInstance))
 			return FALSE;
 	} else if (dwReason == DLL_PROCESS_DETACH) {
 		if (lpvReserved == NULL) {
-			Scintilla::ResourcesRelease(true);
+			Internal::ResourcesRelease(true);
 		}
 	}
 	return TRUE;