diff options
| -rw-r--r-- | include/Accessor.h | 2 | ||||
| -rw-r--r-- | include/PropSet.h | 2 | ||||
| -rw-r--r-- | include/SciLexer.h | 1 | ||||
| -rw-r--r-- | include/Scintilla.h | 6 | ||||
| -rw-r--r-- | include/WindowAccessor.h | 4 |
5 files changed, 12 insertions, 3 deletions
diff --git a/include/Accessor.h b/include/Accessor.h index dc76232e3..b4b7e62ec 100644 --- a/include/Accessor.h +++ b/include/Accessor.h @@ -56,7 +56,7 @@ public: virtual void Flush()=0; virtual int GetLineState(int line)=0; virtual int SetLineState(int line, int state)=0; - virtual PropSet &GetPropSet()=0; + virtual int GetPropertyInt(const char *key, int defaultValue=0)=0; // Style setting virtual void StartAt(unsigned int start, char chMask=31)=0; diff --git a/include/PropSet.h b/include/PropSet.h index 31da01f95..27fd821a4 100644 --- a/include/PropSet.h +++ b/include/PropSet.h @@ -168,7 +168,7 @@ public: WordList(bool onlyLineEnds_ = false) : words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_) {} ~WordList() { Clear(); } - operator bool() { return list; } + operator bool() { return list ? true : false; } const char *operator[](int ind) { return words[ind]; } void Clear(); void Set(const char *s); diff --git a/include/SciLexer.h b/include/SciLexer.h index 3e0ad31b4..b99526e4f 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -21,6 +21,7 @@ #define SCLEX_ERRORLIST 10 #define SCLEX_MAKEFILE 11 #define SCLEX_BATCH 12 +#define SCLEX_XCODE 13 // Lexical states for SCLEX_PYTHON #define SCE_P_DEFAULT 0 diff --git a/include/Scintilla.h b/include/Scintilla.h index 8e5826bf5..12c7a6a14 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -229,6 +229,9 @@ extern "C" { #define SCI_GETLINEINDENTATION SCI_START + 127 #define SCI_GETLINEINDENTPOSITION SCI_START + 128 +#define SCI_SETHSCROLLBAR SCI_START + 130 +#define SCI_GETHSCROLLBAR SCI_START + 131 + #define SCI_CALLTIPSHOW SCI_START + 200 #define SCI_CALLTIPCANCEL SCI_START + 201 #define SCI_CALLTIPACTIVE SCI_START + 202 @@ -299,6 +302,8 @@ extern "C" { #define SCI_LINETRANSPOSE SCI_START + 339 #define SCI_LOWERCASE SCI_START + 340 #define SCI_UPPERCASE SCI_START + 341 +#define SCI_LINESCROLLDOWN SCI_START + 342 +#define SCI_LINESCROLLUP SCI_START + 343 #define SCI_LINELENGTH SCI_START + 350 #define SCI_BRACEHIGHLIGHT SCI_START + 351 @@ -333,6 +338,7 @@ extern "C" { #define SCI_SETCARETPOLICY SCI_START + 369 #define SCI_LINESONSCREEN SCI_START + 370 #define SCI_USEPOPUP SCI_START + 371 +#define SCI_SELECTIONISRECTANGLE SCI_START + 372 // GTK+ Specific #define SCI_GRABFOCUS SCI_START + 400 diff --git a/include/WindowAccessor.h b/include/WindowAccessor.h index 567c47894..89a542e82 100644 --- a/include/WindowAccessor.h +++ b/include/WindowAccessor.h @@ -33,7 +33,9 @@ public: void Flush(); int GetLineState(int line); int SetLineState(int line, int state); - PropSet &GetPropSet() { return props; } + int GetPropertyInt(const char *key, int defaultValue=0) { + return props.GetInt(key, defaultValue); + } void StartAt(unsigned int start, char chMask=31); void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }; |