From 5e886f24d13438063a58e06e74e6c371cf8311e7 Mon Sep 17 00:00:00 2001
From: Zufu Liu <unknown>
Date: Wed, 15 Feb 2023 12:01:42 +1100
Subject: Feature [feature-requests:#1477] More typesafe bindings of *Full APIs
 in ScintillaCall.

---
 include/ScintillaCall.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'include/ScintillaCall.h')

diff --git a/include/ScintillaCall.h b/include/ScintillaCall.h
index 9c851d567..8a01f2acb 100644
--- a/include/ScintillaCall.h
+++ b/include/ScintillaCall.h
@@ -15,6 +15,11 @@ namespace Scintilla {
 
 enum class Message;	// Declare in case ScintillaMessages.h not included
 
+// Declare in case ScintillaStructures.h not included
+struct TextRangeFull;
+struct TextToFindFull;
+struct RangeToFormatFull;
+
 using FunctionDirect = intptr_t(*)(intptr_t ptr, unsigned int iMessage, uintptr_t wParam, intptr_t lParam, int *pStatus);
 
 struct Failure {
@@ -96,7 +101,7 @@ public:
 	void SelectAll();
 	void SetSavePoint();
 	Position GetStyledText(void *tr);
-	Position GetStyledTextFull(void *tr);
+	Position GetStyledTextFull(TextRangeFull *tr);
 	bool CanRedo();
 	Line MarkerLineFromHandle(int markerHandle);
 	void MarkerDeleteHandle(int markerHandle);
@@ -328,9 +333,9 @@ public:
 	void SetPrintColourMode(Scintilla::PrintOption mode);
 	Scintilla::PrintOption PrintColourMode();
 	Position FindText(Scintilla::FindOption searchFlags, void *ft);
-	Position FindTextFull(Scintilla::FindOption searchFlags, void *ft);
+	Position FindTextFull(Scintilla::FindOption searchFlags, TextToFindFull *ft);
 	Position FormatRange(bool draw, void *fr);
-	Position FormatRangeFull(bool draw, void *fr);
+	Position FormatRangeFull(bool draw, RangeToFormatFull *fr);
 	void SetChangeHistory(Scintilla::ChangeHistoryOption changeHistory);
 	Scintilla::ChangeHistoryOption ChangeHistory();
 	Line FirstVisibleLine();
@@ -347,7 +352,7 @@ public:
 	Position GetSelText(char *text);
 	std::string GetSelText();
 	Position GetTextRange(void *tr);
-	Position GetTextRangeFull(void *tr);
+	Position GetTextRangeFull(TextRangeFull *tr);
 	void HideSelection(bool hide);
 	bool SelectionHidden();
 	int PointXFromPosition(Position pos);
-- 
cgit v1.2.3