aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-03-07 13:07:31 +1100
committerNeil <nyamatongwe@gmail.com>2019-03-07 13:07:31 +1100
commitc9583121d5ac254ee9a0ec538f7a19e680f1f434 (patch)
tree3b8cdb4b6202e18c61b90046736205de0a1a75de
parentb87af475d5cc5736eaf0a2f5addfa900abe46eed (diff)
downloadscintilla-mirror-c9583121d5ac254ee9a0ec538f7a19e680f1f434.tar.gz
Move CARETSTYLE_INS_MASK from Scintilla.iface as it is not documented.rel-4-1-4
-rw-r--r--include/Scintilla.h1
-rw-r--r--include/Scintilla.iface1
-rw-r--r--src/ViewStyle.cxx2
3 files changed, 2 insertions, 2 deletions
diff --git a/include/Scintilla.h b/include/Scintilla.h
index dc0a73b7e..ef4f12b9f 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -829,7 +829,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define CARETSTYLE_BLOCK 2
#define CARETSTYLE_OVERSTRIKE_BAR 0
#define CARETSTYLE_OVERSTRIKE_BLOCK 16
-#define CARETSTYLE_INS_MASK 0xF
#define SCI_SETCARETSTYLE 2512
#define SCI_GETCARETSTYLE 2513
#define SCI_SETINDICATORCURRENT 2500
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index aed70e7f3..ca936ab31 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -2173,7 +2173,6 @@ val CARETSTYLE_LINE=1
val CARETSTYLE_BLOCK=2
val CARETSTYLE_OVERSTRIKE_BAR=0
val CARETSTYLE_OVERSTRIKE_BLOCK=16
-val CARETSTYLE_INS_MASK=0xF
# Set the style of the caret to be drawn.
set void SetCaretStyle=2512(int caretStyle,)
diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx
index 148163bec..2da3a2a52 100644
--- a/src/ViewStyle.cxx
+++ b/src/ViewStyle.cxx
@@ -27,6 +27,8 @@
#include "Style.h"
#include "ViewStyle.h"
+#define CARETSTYLE_INS_MASK 0xF
+
using namespace Scintilla;
MarginStyle::MarginStyle(int style_, int width_, int mask_) :