aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZufu Liu <unknown>2019-06-22 13:07:31 +1000
committerZufu Liu <unknown>2019-06-22 13:07:31 +1000
commit0ec94728bf7359fde4f23a9cf9287e1e59cc330c (patch)
tree04baf0de90aab2ceb1b11060ef9cee542616a643
parentb66902dfa3778d74c37ae8cf279021bf85c7c9a5 (diff)
downloadscintilla-mirror-0ec94728bf7359fde4f23a9cf9287e1e59cc330c.tar.gz
Feature [feature-requests:#1297] Updates to types of LineScroll,
[Set]MarginTypeN, and [Set]MarginCursorN.
-rw-r--r--doc/ScintillaDoc.html4
-rw-r--r--include/Scintilla.iface10
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index d5e5b7385..3b231311a 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -1863,7 +1863,7 @@ struct Sci_TextToFind {
<a class="message" href="#SCI_GETFIRSTVISIBLELINE">SCI_GETFIRSTVISIBLELINE &rarr; line</a><br />
<a class="message" href="#SCI_SETXOFFSET">SCI_SETXOFFSET(int xOffset)</a><br />
<a class="message" href="#SCI_GETXOFFSET">SCI_GETXOFFSET &rarr; int</a><br />
- <a class="message" href="#SCI_LINESCROLL">SCI_LINESCROLL(int columns, line lines)</a><br />
+ <a class="message" href="#SCI_LINESCROLL">SCI_LINESCROLL(position columns, line lines)</a><br />
<a class="message" href="#SCI_SCROLLCARET">SCI_SCROLLCARET</a><br />
<a class="message" href="#SCI_SCROLLRANGE">SCI_SCROLLRANGE(position secondary, position primary)</a><br />
<a class="message" href="#SCI_SETXCARETPOLICY">SCI_SETXCARETPOLICY(int caretPolicy, int
@@ -1896,7 +1896,7 @@ struct Sci_TextToFind {
view. A value of 0 is the normal position with the first text column visible at the left of the
view.</p>
- <p><b id="SCI_LINESCROLL">SCI_LINESCROLL(int columns, line lines)</b><br />
+ <p><b id="SCI_LINESCROLL">SCI_LINESCROLL(position columns, line lines)</b><br />
This will attempt to scroll the display by the number of columns and lines that you specify.
Positive line values increase the line number at the top of the screen (i.e. they move the text
upwards as far as the user is concerned), Negative line values do the reverse.</p>
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 35ea146c5..8251c5af9 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -421,10 +421,10 @@ val SC_MARGIN_COLOUR=6
ali SC_MARGIN_RTEXT=R_TEXT
# Set a margin to be either numeric or symbolic.
-set void SetMarginTypeN=2240(int margin, int marginType)
+set void SetMarginTypeN=2240(int margin, MarginType marginType)
# Retrieve the type of a margin.
-get int GetMarginTypeN=2241(int margin,)
+get MarginType GetMarginTypeN=2241(int margin,)
# Set the width of a margin to a width expressed in pixels.
set void SetMarginWidthN=2242(int margin, int pixelWidth)
@@ -445,10 +445,10 @@ set void SetMarginSensitiveN=2246(int margin, bool sensitive)
get bool GetMarginSensitiveN=2247(int margin,)
# Set the cursor shown when the mouse is inside a margin.
-set void SetMarginCursorN=2248(int margin, int cursor)
+set void SetMarginCursorN=2248(int margin, CursorShape cursor)
# Retrieve the cursor shown in a margin.
-get int GetMarginCursorN=2249(int margin,)
+get CursorShape GetMarginCursorN=2249(int margin,)
# Set the background colour of a margin. Only visible for SC_MARGIN_COLOUR.
set void SetMarginBackN=2250(int margin, colour back)
@@ -1122,7 +1122,7 @@ fun line LineFromPosition=2166(position pos,)
fun position PositionFromLine=2167(line line,)
# Scroll horizontally and vertically.
-fun void LineScroll=2168(int columns, line lines)
+fun void LineScroll=2168(position columns, line lines)
# Ensure the caret is visible.
fun void ScrollCaret=2169(,)