update scintilla (HG 9739512b19c4)

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@741 28bd50df-7adb-d945-0439-6e466c6a13cc

3 files changed, 26 insertions, 0 deletions

diff --git a/scintilla/include/Platform.h b/scintilla/include/Platform.h
index 46c3642..0f9fb00 100644
--- a/scintilla/include/Platform.h
+++ b/scintilla/include/Platform.h
@@ -20,6 +20,7 @@
 #define PLAT_MACOSX 0

 #define PLAT_WIN 0

 #define PLAT_WX  0

+#define PLAT_QT 0

 #define PLAT_FOX 0

 

 #if defined(FOX)

@@ -34,6 +35,10 @@
 #undef PLAT_GTK

 #define PLAT_GTK 1

 

+#elif defined(SCINTILLA_QT)

+#undef PLAT_QT

+#define PLAT_QT 1

+

 #if defined(__WIN32__) || defined(_MSC_VER)

 #undef PLAT_GTK_WIN32

 #define PLAT_GTK_WIN32 1

@@ -511,4 +516,10 @@ public:
 #pragma warning(disable: 4244 4309 4514 4710)

 #endif

 

+#if defined(__GNUC__) && defined(SCINTILLA_QT)

+#pragma GCC diagnostic ignored "-Wmissing-braces"

+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"

+#pragma GCC diagnostic ignored "-Wchar-subscripts"

+#endif

+

 #endif

diff --git a/scintilla/include/Scintilla.h b/scintilla/include/Scintilla.h
index b9697e9..17a60c1 100644
--- a/scintilla/include/Scintilla.h
+++ b/scintilla/include/Scintilla.h
@@ -51,6 +51,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_ADDSTYLEDTEXT 2002

 #define SCI_INSERTTEXT 2003

 #define SCI_CLEARALL 2004

+#define SCI_DELETERANGE 2645

 #define SCI_CLEARDOCUMENTSTYLE 2005

 #define SCI_GETLENGTH 2006

 #define SCI_GETCHARAT 2007

@@ -728,6 +729,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_GETPOSITIONCACHE 2515

 #define SCI_COPYALLOWLINE 2519

 #define SCI_GETCHARACTERPOINTER 2520

+#define SCI_GETRANGEPOINTER 2643

+#define SCI_GETGAPPOSITION 2644

 #define SCI_SETKEYSUNICODE 2521

 #define SCI_GETKEYSUNICODE 2522

 #define SCI_INDICSETALPHA 2523

diff --git a/scintilla/include/Scintilla.iface b/scintilla/include/Scintilla.iface
index 7c51494..adc637c 100644
--- a/scintilla/include/Scintilla.iface
+++ b/scintilla/include/Scintilla.iface
@@ -101,6 +101,9 @@ fun void InsertText=2003(position pos, string text)
 # Delete all text in the document.

 fun void ClearAll=2004(,)

 

+# Delete a range of text in the document.

+fun void DeleteRange=2645(position pos, int deleteLength)

+

 # Set all style bytes to 0, remove all folding information.

 fun void ClearDocumentStyle=2005(,)

 

@@ -1924,6 +1927,15 @@ fun void CopyAllowLine=2519(,)
 # characters in the document.

 get int GetCharacterPointer=2520(,)

 

+# Return a read-only pointer to a range of characters in the document.

+# May move the gap so that the range is contiguous, but will only move up

+# to rangeLength bytes.

+get int GetRangePointer=2643(int position, int rangeLength)

+

+# Return a position which, to avoid performance costs, should not be within

+# the range of a call to GetRangePointer.

+get position GetGapPosition=2644(,)

+

 # Always interpret keyboard input as Unicode

 set void SetKeysUnicode=2521(bool keysUnicode,)