From e72d294166a11717d23c4d1d69c230b49612067c Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Mon, 24 Jul 2000 07:47:57 +0000
Subject: Renumbered constants and added new messages to Scintilla.iface.

---
 include/Scintilla.h     |  81 ++++++++++++++++----------------
 include/Scintilla.iface | 122 +++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 160 insertions(+), 43 deletions(-)

(limited to 'include')

diff --git a/include/Scintilla.h b/include/Scintilla.h
index e2c062378..67da01825 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -248,6 +248,45 @@ typedef long (*SciFnDirect)(long ptr, unsigned int iMessage, unsigned long wPara
 #define SCI_SETPRINTCOLOURMODE SCI_START + 148
 #define SCI_GETPRINTCOLOURMODE SCI_START + 149
 
+#define SCI_FINDTEXT SCI_START + 150
+#define SCI_FORMATRANGE SCI_START + 151
+#define SCI_GETFIRSTVISIBLELINE SCI_START + 152
+#define SCI_GETLINE SCI_START + 153
+#define SCI_GETLINECOUNT SCI_START + 154
+#define SCI_SETMARGINLEFT SCI_START + 155
+#define SCI_GETMARGINLEFT SCI_START + 156
+#define SCI_SETMARGINRIGHT SCI_START + 157
+#define SCI_GETMARGINRIGHT SCI_START + 158
+#define SCI_GETMODIFY SCI_START + 159
+#define SCI_SETSEL SCI_START + 160
+#define SCI_GETSELTEXT SCI_START + 161
+#define SCI_GETTEXTRANGE SCI_START + 162
+#define SCI_HIDESELECTION SCI_START + 163
+#define SCI_POINTXFROMPOSITION SCI_START + 164
+#define SCI_POINTYFROMPOSITION SCI_START + 165
+#define SCI_LINEFROMPOSITION SCI_START + 166
+#define SCI_POSITIONFROMLINE SCI_START + 167
+#define SCI_LINESCROLL SCI_START + 168
+#define SCI_SCROLLCARET SCI_START + 169
+#define SCI_REPLACESEL SCI_START + 170
+#define SCI_SETREADONLY SCI_START + 171
+
+#define SCI_NULL SCI_START + 172
+#define SCI_CANPASTE SCI_START + 173
+#define SCI_CANUNDO SCI_START + 174
+#define SCI_EMPTYUNDOBUFFER SCI_START + 175
+#define SCI_UNDO SCI_START + 176
+#define SCI_CUT SCI_START + 177
+#define SCI_COPY SCI_START + 178
+#define SCI_PASTE SCI_START + 179
+#define SCI_CLEAR SCI_START + 180
+#define SCI_SETTEXT SCI_START + 181
+#define SCI_GETTEXT SCI_START + 182
+#define SCI_GETTEXTLENGTH SCI_START + 183
+
+#define SCI_GETDIRECTFUNCTION SCI_START + 184
+#define SCI_GETDIRECTPOINTER SCI_START + 185
+
 #define SCI_CALLTIPSHOW SCI_START + 200
 #define SCI_CALLTIPCANCEL SCI_START + 201
 #define SCI_CALLTIPACTIVE SCI_START + 202
@@ -420,6 +459,7 @@ typedef void (tMacroRecorder)(unsigned int iMessage, unsigned long wParam,
 #define SCN_NEEDSHOWN 2011
 
 // For compatibility, these go through the COMMAND notification rather than NOTIFY
+// and have exactly the same values as the EN_* constants.
 #define SCEN_CHANGE 768
 #define SCEN_SETFOCUS 512
 #define SCEN_KILLFOCUS 256
@@ -493,47 +533,6 @@ struct SCNotification {
 #define SC_MASK_FOLDERS ((1<<SC_MARKNUM_FOLDER) | (1<<SC_MARKNUM_FOLDEROPEN))
 
 // Moving from WM_* and EM_*
-#define SCI_CANPASTE	5000
-#define SCI_CANUNDO	5001
-#define SCI_POINTXFROMPOSITION	5034
-#define SCI_POINTYFROMPOSITION	5035
-#define SCI_EMPTYUNDOBUFFER	5003
-#define SCI_GETSEL	5004
-#define SCI_SETSEL	5005
-#define SCI_LINEFROMPOSITION	5006
-#define SCI_FINDTEXT	5036
-#define SCI_FORMATRANGE	5037
-#define SCI_GETFIRSTVISIBLELINE	5007
-#define SCI_GETLINE	5028
-#define SCI_GETLINECOUNT	5008
-//#define SCI_GETMARGINS	(212)
-#define SCI_GETMARGINLEFT	5030
-#define SCI_GETMARGINRIGHT 5031
-#define SCI_SETMARGINLEFT	5032
-#define SCI_SETMARGINRIGHT 5033
-#define SCI_GETMODIFY	5009
-#define SCI_GETSELTEXT	5010
-#define SCI_GETTEXTRANGE	5011
-#define SCI_HIDESELECTION	5012
-#define SCI_POSITIONFROMLINE	5013
-#define SCI_LINESCROLL	5014
-#define SCI_REPLACESEL	5015
-#define SCI_SCROLLCARET	5016
-#define SCI_SETMARGINS	5017
-#define SCI_SETREADONLY	5018
-#define SCI_UNDO	5019
-
-#define SCI_NULL	5020
-#define SCI_CLEAR	5021
-#define SCI_COPY	5022
-#define SCI_CUT	5023
-#define SCI_GETTEXT	5024
-#define SCI_GETTEXTLENGTH	5025
-#define SCI_PASTE	5026
-#define SCI_SETTEXT	5027
-
-#define SCI_GETDIRECTFUNCTION 5040
-#define SCI_GETDIRECTPOINTER 5041
 
 #define SCFIND_MATCHCASE	4
 #define SCFIND_WHOLEWORD 2
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 824477c98..321623a9c 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -121,10 +121,9 @@ get int GetViewWS=2020(,)
 
 # Make white space characters invisible, always visible or visible outside indentation.
 set void SetViewWS=2021(int viewWS,)
-# Find the position and line from a point within the window.
 
 # Find the position from a point within the window.
-fun int PositionFromPoint=2022(,point pt)
+fun int PositionFromPoint=2022(int x, int y)
 
 # Set caret to start of a line and ensure it is visible.
 fun void GotoLine=2024(int line,)
@@ -529,6 +528,119 @@ set void SetPrintColourMode=2148(int mode,)
 # Returns the print colour mode.
 get int GetPrintColourMode=2149(,)
 
+# Find some text in the document.
+fun position FindText=2150(int flags, findtext ft)
+
+# On Windows will draw the document into a display context such as a printer.
+fun void FormatRange=2151(bool draw, formatrange fr)
+
+# Retrieve the line at the top of the display.
+get int GetFirstVisibleLine=2152(,)
+
+# Retrieve the contents of a line.
+# Returns the length of the line.
+fun int GetLine=2153(int line, stringresult text)
+
+# Returns the number of lines in the document. There is always at least one.
+get int GetLineCount=2154(,)
+
+# Sets the size in pixels of the left margin.
+set void SetMarginLeft=2155(, int width)
+
+# Returns the size in pixels of the left margin.
+get int GetMarginLeft=2156(,)
+
+# Sets the size in pixels of the right margin.
+set void SetMarginRight=2157(, int width)
+
+# Returns the size in pixels of the right margin.
+get int GetMarginRight=2158(,)
+
+# Is the document different from when it was last saved?
+get bool GetModify=2159(,)
+
+# Select a range of text.
+fun void SetSel=2160(position start, position end)
+
+# Retrieve the selected text.
+# Return the length of the text.
+fun int GetSelText=2161(,stringresult text)
+
+# Retrieve a range of text.
+# Return the length of the text.
+fun int GetTextRange=2162(, textrange tr)
+
+# Draw the selection in normal style or with selection highlighted.
+fun void HideSelection=2163(bool normal,)
+
+# Retrieve the x value of the point in the window where a position is displayed.
+fun int PointXFromPosition=2164(, position pos)
+
+# Retrieve the y value of the point in the window where a position is displayed.
+fun int PointYFromPosition=2165(, position pos)
+
+# Retrieve the line containing a position.
+fun int LineFromPosition=2166(position pos,)
+
+# Retrieve the position at the start of a line.
+fun int PositionFromLine=2167(int line,)
+
+# Scroll horizontally and vertically.
+fun void LineScroll=2168(int columns, int lines)
+
+# Ensure the caret is visible.
+fun void ScrollCaret=2169(,)
+
+# Replace the selected text with the argument text.
+fun void ReplaceSel=2170(, string text)
+
+# Set to read only or read write.
+set void SetReadOnly=2171(bool readOnly,)
+
+# Null operation.
+fun void Null=2172(,)
+
+# Will a paste succeed?
+fun bool CanPaste=2173(,)
+
+# Are there any undoable actions in the undo history.
+fun bool CanUndo=2174(,)
+
+# Delete the undo history.
+fun void EmptyUndoBuffer=2175(,)
+
+# Undo one action in the undo history.
+fun void Undo=2176(,)
+
+# Cut the selection to the clipboard.
+fun void Cut=2177(,)
+
+# Copy the selection to the clipboard.
+fun void Copy=2178(,)
+
+# Paste the contents of the clipboard into the document replacing the selection.
+fun void Paste=2179(,)
+
+# Clear the selection.
+fun void Clear=2180(,)
+
+# Replace the contents of the document with the argument text.
+fun void SetText=2181(, string text)
+
+# Retrieve all the text in the document.
+# Returns number of characters retrieved.
+fun int GetText=2182(int length, stringresult text)
+
+# Retrieve the number of characters in the document.
+get int GetTextLength=2183(,)
+
+# Retrieve a pointer to a function that processes messages for this Scintilla.
+get int GetDirectFunction=2184(,)
+
+# Retrieve a pointer value to use as the first argument when calling
+# the function returned by GetDirectFunction.
+get int GetDirectPointer=2185(,)
+
 # Show a call tip containing a definition near position pos.
 fun void CallTipShow=2200(position pos, string definition)
 
@@ -874,6 +986,12 @@ val SCN_MACRORECORD=2009
 val SCN_MARGINCLICK=2010
 val SCN_NEEDSHOWN=2011
 
+# For compatibility, these go through the COMMAND notification rather than NOTIFY
+# and have exactly the same values as the EN_* constants.
+val SCEN_CHANGE=768
+val SCEN_SETFOCUS=512
+val SCEN_KILLFOCUS=256
+
 ################################################
 # From SciLexer.h
 val SCLEX_CONTAINER=0
-- 
cgit v1.2.3