content must be changeable by wx even though control may be disabled

[wxWidgets.git] / src / stc / scintilla / src / WindowAccessor.cxx

diff --git a/src/stc/scintilla/src/WindowAccessor.cxx b/src/stc/scintilla/src/WindowAccessor.cxx
index 5f3deac7db969f7fb0dbe038fd8adde7d501e135..8093300bc05bc41471c2abb5a81f4a86a271fdef 100644 (file)
--- a/src/stc/scintilla/src/WindowAccessor.cxx
+++ b/src/stc/scintilla/src/WindowAccessor.cxx
@@ -1,6 +1,8 @@
-// SciTE - Scintilla based Text Editor
-// Accessor.cxx - rapid easy access to contents of a Scintilla
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
+// Scintilla source code edit control
+/** @file WindowAccessor.cxx
+ ** Rapid easy access to contents of a Scintilla.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>

 // The License.txt file describes the conditions under which this software may be distributed.
 
 #include <stdlib.h>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #include <stdlib.h>


@@ -15,25 +17,21 @@
 #include "WindowAccessor.h"
 #include "Scintilla.h"
 
 #include "WindowAccessor.h"
 #include "Scintilla.h"
 

+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+

 WindowAccessor::~WindowAccessor() {
 }
 
 WindowAccessor::~WindowAccessor() {
 }
 

-#if PLAT_WIN 

 bool WindowAccessor::InternalIsLeadByte(char ch) {
        if (SC_CP_UTF8 == codePage)
                // For lexing, all characters >= 0x80 are treated the
                // same so none is considered a lead byte.
                return false;   
        else
 bool WindowAccessor::InternalIsLeadByte(char ch) {
        if (SC_CP_UTF8 == codePage)
                // For lexing, all characters >= 0x80 are treated the
                // same so none is considered a lead byte.
                return false;   
        else

-               return IsDBCSLeadByteEx(codePage, ch);
-}
-#else
-// PLAT_GTK or PLAT_WX
-// TODO: support DBCS under GTK+ and WX
-bool WindowAccessor::InternalIsLeadByte(char) {
-       return false;
+               return Platform::IsDBCSLeadByte(codePage, ch);

 }
 }

-#endif 

 
 void WindowAccessor::Fill(int position) {
        if (lenDoc == -1)
 
 void WindowAccessor::Fill(int position) {
        if (lenDoc == -1)


@@ -48,7 +46,16 @@ void WindowAccessor::Fill(int position) {
                endPos = lenDoc;
 
        TextRange tr = {{startPos, endPos}, buf};
                endPos = lenDoc;
 
        TextRange tr = {{startPos, endPos}, buf};

-       Platform::SendScintilla(id, SCI_GETTEXTRANGE, 0, reinterpret_cast<long>(&tr));
+       Platform::SendScintillaPointer(id, SCI_GETTEXTRANGE, 0, &tr);
+}
+
+bool WindowAccessor::Match(int pos, const char *s) {
+       for (int i=0; *s; i++) {
+               if (*s != SafeGetCharAt(pos+i))
+                       return false;
+               s++;
+       }
+       return true;

 }
 
 char WindowAccessor::StyleAt(int position) {
 }
 
 char WindowAccessor::StyleAt(int position) {


@@ -122,8 +129,8 @@ void WindowAccessor::Flush() {
        startPos = extremePosition;
        lenDoc = -1;
        if (validLen > 0) {
        startPos = extremePosition;
        lenDoc = -1;
        if (validLen > 0) {

-               Platform::SendScintilla(id, SCI_SETSTYLINGEX, validLen, 
-                       reinterpret_cast<long>(styleBuf));
+               Platform::SendScintillaPointer(id, SCI_SETSTYLINGEX, validLen, 
+                       styleBuf);

                validLen = 0;
        }
 }
                validLen = 0;
        }
 }


@@ -173,3 +180,12 @@ int WindowAccessor::IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsC
                return indent;
 }
 
                return indent;
 }
 

+void WindowAccessor::IndicatorFill(int start, int end, int indicator, int value) {
+       Platform::SendScintilla(id, SCI_SETINDICATORCURRENT, indicator);
+       if (value) {
+               Platform::SendScintilla(id, SCI_SETINDICATORVALUE, value);
+               Platform::SendScintilla(id, SCI_INDICATORFILLRANGE, start, end - start);
+       } else {
+               Platform::SendScintilla(id, SCI_INDICATORCLEARRANGE, start, end - start);
+       }
+}