Menu
▾
▴
[Anyedit-cvs]AnyEditv2 Platform.h,1.2,1.3 SciLexer.h,1.9,1.10 Scintilla.h,1.13,1.14 scintillaif.cpp,1.20,1.21 scintillaif.h,1.16,1.17
|
From: boca4711 <boc...@us...> - 2005-06-06 19:17:41
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21544 Modified Files: Platform.h SciLexer.h Scintilla.h scintillaif.cpp scintillaif.h Log Message: Updated to scintilla control 1.64 Index: scintillaif.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/scintillaif.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** scintillaif.cpp 11 Apr 2005 08:20:27 -0000 1.20 --- scintillaif.cpp 6 Jun 2005 19:17:30 -0000 1.21 *************** *** 1807,1813 **** } ! int CScintilla::GetEndAtLastLine() { ! return (int)SPerform(SCI_GETENDATLASTLINE, 0, 0); } --- 1807,1813 ---- } ! bool CScintilla::GetEndAtLastLine() { ! return SPerform(SCI_GETENDATLASTLINE, 0, 0) != 0; } *************** *** 2682,2684 **** --- 2682,2699 ---- } + int CScintilla::GetProperty(const char* key, char* buf) + { + return (int)SPerform(SCI_GETPROPERTY, (long)key, (long)buf); + } + + int CScintilla::GetPropertyExpanded(const char* key, char* buf) + { + return (int)SPerform(SCI_GETPROPERTYEXPANDED, (long)key, (long)buf); + } + + int CScintilla::GetPropertyInt(const char* key) + { + return (int)SPerform(SCI_GETPROPERTYINT, (long)key, 0); + } + //-- Index: scintillaif.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/scintillaif.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** scintillaif.h 11 Apr 2005 08:20:27 -0000 1.16 --- scintillaif.h 6 Jun 2005 19:17:30 -0000 1.17 *************** *** 1219,1223 **** * line at the bottom of the view. */ ! int GetEndAtLastLine(); /** * Retrieve the height of a particular line of text in pixels. --- 1219,1223 ---- * line at the bottom of the view. */ ! bool GetEndAtLastLine(); /** * Retrieve the height of a particular line of text in pixels. *************** *** 1910,1914 **** /** * Set the length of the utf8 argument for calling EncodedFromUTF8. ! * Set to 0 and the string will be measured to the first nul. */ void SetLengthForEncode(int bytes); --- 1910,1914 ---- /** * Set the length of the utf8 argument for calling EncodedFromUTF8. ! * Set to -1 and the string will be measured to the first nul. */ void SetLengthForEncode(int bytes); *************** *** 1972,1975 **** --- 1972,1989 ---- */ void LoadLexerLibrary(const char* path); + /** + * Retrieve a "property" value previously set with SetProperty. + */ + int GetProperty(const char* key, char* buf); + /** + * Retrieve a "property" value previously set with SetProperty, + * with "$()" variable replacement on returned buffer. + */ + int GetPropertyExpanded(const char* key, char* buf); + /** + * Retrieve a "property" value previously set with SetProperty, + * interpreted as an int AFTER any "$()" variable replacement. + */ + int GetPropertyInt(const char* key); //-- //@} Index: Platform.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/Platform.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Platform.h 27 Nov 2004 15:13:45 -0000 1.2 --- Platform.h 6 Jun 2005 19:17:30 -0000 1.3 *************** *** 288,291 **** --- 288,292 ---- void SetID(FontID id_) { id = id_; } friend class Surface; + friend class SurfaceImpl; }; *************** *** 393,399 **** virtual void SetFont(Font &font)=0; ! virtual void Create(Window &parent, int ctrlID, int lineHeight_, bool unicodeMode_)=0; virtual void SetAverageCharWidth(int width)=0; virtual void SetVisibleRows(int rows)=0; virtual PRectangle GetDesiredRect()=0; virtual int CaretFromEdge()=0; --- 394,401 ---- virtual void SetFont(Font &font)=0; ! virtual void Create(Window &parent, int ctrlID, Point location, int lineHeight_, bool unicodeMode_)=0; virtual void SetAverageCharWidth(int width)=0; virtual void SetVisibleRows(int rows)=0; + virtual int GetVisibleRows() const=0; virtual PRectangle GetDesiredRect()=0; virtual int CaretFromEdge()=0; *************** *** 408,411 **** --- 410,414 ---- virtual void ClearRegisteredImages()=0; virtual void SetDoubleClickAction(CallBackAction, void *)=0; + virtual void SetList(const char* list, char separator, char typesep)=0; }; Index: Scintilla.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/Scintilla.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Scintilla.h 11 Apr 2005 08:20:26 -0000 1.13 --- Scintilla.h 6 Jun 2005 19:17:30 -0000 1.14 *************** *** 118,121 **** --- 118,122 ---- #define SC_MARK_ARROWS 24 #define SC_MARK_PIXMAP 25 + #define SC_MARK_FULLRECT 26 #define SC_MARK_CHARACTER 10000 #define SC_MARKNUM_FOLDEREND 25 *************** *** 174,177 **** --- 175,179 ---- #define SC_CHARSET_VIETNAMESE 163 #define SC_CHARSET_THAI 222 + #define SC_CHARSET_8859_15 1000 #define SCI_STYLECLEARALL 2050 #define SCI_STYLESETFORE 2051 *************** *** 611,614 **** --- 613,619 ---- #define SCI_SETLEXERLANGUAGE 4006 #define SCI_LOADLEXERLIBRARY 4007 + #define SCI_GETPROPERTY 4008 + #define SCI_GETPROPERTYEXPANDED 4009 + #define SCI_GETPROPERTYINT 4010 #define SC_MOD_INSERTTEXT 0x1 #define SC_MOD_DELETETEXT 0x2 *************** *** 618,626 **** #define SC_PERFORMED_UNDO 0x20 #define SC_PERFORMED_REDO 0x40 #define SC_LASTSTEPINUNDOREDO 0x100 #define SC_MOD_CHANGEMARKER 0x200 #define SC_MOD_BEFOREINSERT 0x400 #define SC_MOD_BEFOREDELETE 0x800 ! #define SC_MODEVENTMASKALL 0xF77 #define SCEN_CHANGE 768 #define SCEN_SETFOCUS 512 --- 623,633 ---- #define SC_PERFORMED_UNDO 0x20 #define SC_PERFORMED_REDO 0x40 + #define SC_MULTISTEPUNDOREDO 0x80 #define SC_LASTSTEPINUNDOREDO 0x100 #define SC_MOD_CHANGEMARKER 0x200 #define SC_MOD_BEFOREINSERT 0x400 #define SC_MOD_BEFOREDELETE 0x800 ! #define SC_MULTILINEUNDOREDO 0x1000 ! #define SC_MODEVENTMASKALL 0x1FFF #define SCEN_CHANGE 768 #define SCEN_SETFOCUS 512 Index: SciLexer.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SciLexer.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SciLexer.h 11 Apr 2005 08:20:22 -0000 1.9 --- SciLexer.h 6 Jun 2005 19:17:30 -0000 1.10 *************** *** 44,49 **** #define SCLEX_BULLANT 27 #define SCLEX_VBSCRIPT 28 - #define SCLEX_ASP 29 - #define SCLEX_PHP 30 #define SCLEX_BAAN 31 #define SCLEX_MATLAB 32 --- 44,47 ---- *************** *** 85,88 **** --- 83,91 ---- #define SCLEX_HASKELL 68 #define SCLEX_PHPSCRIPT 69 + #define SCLEX_TADS3 70 + #define SCLEX_REBOL 71 + #define SCLEX_SMALLTALK 72 + #define SCLEX_FLAGSHIP 73 + #define SCLEX_CSOUND 74 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 *************** *** 261,264 **** --- 264,268 ---- #define SCE_PL_STRING_QR 29 #define SCE_PL_STRING_QW 30 + #define SCE_PL_POD_VERB 31 #define SCE_B_DEFAULT 0 #define SCE_B_COMMENT 1 *************** *** 833,836 **** --- 837,981 ---- #define SCE_HA_COMMENTBLOCK2 15 #define SCE_HA_COMMENTBLOCK3 16 + #define SCE_T3_DEFAULT 0 + #define SCE_T3_PREPROCESSOR 1 + #define SCE_T3_BLOCK_COMMENT 2 + #define SCE_T3_LINE_COMMENT 3 + #define SCE_T3_OPERATOR 4 + #define SCE_T3_KEYWORD 5 + #define SCE_T3_NUMBER 6 + #define SCE_T3_BRACKET 7 + #define SCE_T3_HTML_TAG 8 + #define SCE_T3_HTML_STRING 9 + #define SCE_T3_S_STRING 10 + #define SCE_T3_S_LIB_DIRECTIVE 11 + #define SCE_T3_S_MSG_PARAM 12 + #define SCE_T3_S_H_DEFAULT 13 + #define SCE_T3_D_STRING 14 + #define SCE_T3_D_LIB_DIRECTIVE 15 + #define SCE_T3_D_MSG_PARAM 16 + #define SCE_T3_D_H_DEFAULT 17 + #define SCE_T3_X_DEFAULT 18 + #define SCE_T3_X_PREPROCESSOR 19 + #define SCE_T3_X_BLOCK_COMMENT 20 + #define SCE_T3_X_LINE_COMMENT 21 + #define SCE_T3_X_S_STRING 22 + #define SCE_T3_X_S_LIB_DIRECTIVE 23 + #define SCE_T3_X_S_MSG_PARAM 24 + #define SCE_T3_X_S_H_DEFAULT 25 + #define SCE_T3_X_D_STRING 26 + #define SCE_T3_X_D_LIB_DIRECTIVE 27 + #define SCE_T3_X_D_MSG_PARAM 28 + #define SCE_T3_X_D_H_DEFAULT 29 + #define SCE_T3_USER1 30 + #define SCE_T3_USER2 31 + #define SCE_REBOL_DEFAULT 0 + #define SCE_REBOL_COMMENTLINE 1 + #define SCE_REBOL_COMMENTBLOCK 2 + #define SCE_REBOL_PREFACE 3 + #define SCE_REBOL_OPERATOR 4 + #define SCE_REBOL_CHARACTER 5 + #define SCE_REBOL_QUOTEDSTRING 6 + #define SCE_REBOL_BRACEDSTRING 7 + #define SCE_REBOL_NUMBER 8 + #define SCE_REBOL_PAIR 9 + #define SCE_REBOL_TUPLE 10 + #define SCE_REBOL_BINARY 11 + #define SCE_REBOL_MONEY 12 + #define SCE_REBOL_ISSUE 13 + #define SCE_REBOL_TAG 14 + #define SCE_REBOL_FILE 15 + #define SCE_REBOL_EMAIL 16 + #define SCE_REBOL_URL 17 + #define SCE_REBOL_DATE 18 + #define SCE_REBOL_TIME 19 + #define SCE_REBOL_IDENTIFIER 20 + #define SCE_REBOL_WORD 21 + #define SCE_REBOL_WORD2 22 + #define SCE_REBOL_WORD3 23 + #define SCE_REBOL_WORD4 24 + #define SCE_REBOL_WORD5 25 + #define SCE_REBOL_WORD6 26 + #define SCE_REBOL_WORD7 27 + #define SCE_REBOL_WORD8 28 + #define SCE_SQL_DEFAULT 0 + #define SCE_SQL_COMMENT 1 + #define SCE_SQL_COMMENTLINE 2 + #define SCE_SQL_COMMENTDOC 3 + #define SCE_SQL_NUMBER 4 + #define SCE_SQL_WORD 5 + #define SCE_SQL_STRING 6 + #define SCE_SQL_CHARACTER 7 + #define SCE_SQL_SQLPLUS 8 + #define SCE_SQL_SQLPLUS_PROMPT 9 + #define SCE_SQL_OPERATOR 10 + #define SCE_SQL_IDENTIFIER 11 + #define SCE_SQL_SQLPLUS_COMMENT 13 + #define SCE_SQL_COMMENTLINEDOC 15 + #define SCE_SQL_WORD2 16 + #define SCE_SQL_COMMENTDOCKEYWORD 17 + #define SCE_SQL_COMMENTDOCKEYWORDERROR 18 + #define SCE_SQL_USER1 19 + #define SCE_SQL_USER2 20 + #define SCE_SQL_USER3 21 + #define SCE_SQL_USER4 22 + #define SCE_ST_DEFAULT 0 + #define SCE_ST_STRING 1 + #define SCE_ST_NUMBER 2 + #define SCE_ST_COMMENT 3 + #define SCE_ST_SYMBOL 4 + #define SCE_ST_BINARY 5 + #define SCE_ST_BOOL 6 + #define SCE_ST_SELF 7 + #define SCE_ST_SUPER 8 + #define SCE_ST_NIL 9 + #define SCE_ST_GLOBAL 10 + #define SCE_ST_RETURN 11 + #define SCE_ST_SPECIAL 12 + #define SCE_ST_KWSEND 13 + #define SCE_ST_ASSIGN 14 + #define SCE_ST_CHARACTER 15 + #define SCE_ST_SPEC_SEL 16 + #define SCE_FS_DEFAULT 0 + #define SCE_FS_COMMENT 1 + #define SCE_FS_COMMENTLINE 2 + #define SCE_FS_COMMENTDOC 3 + #define SCE_FS_COMMENTLINEDOC 4 + #define SCE_FS_COMMENTDOCKEYWORD 5 + #define SCE_FS_COMMENTDOCKEYWORDERROR 6 + #define SCE_FS_KEYWORD 7 + #define SCE_FS_KEYWORD2 8 + #define SCE_FS_KEYWORD3 9 + #define SCE_FS_KEYWORD4 10 + #define SCE_FS_NUMBER 11 + #define SCE_FS_STRING 12 + #define SCE_FS_PREPROCESSOR 13 + #define SCE_FS_OPERATOR 14 + #define SCE_FS_IDENTIFIER 15 + #define SCE_FS_DATE 16 + #define SCE_FS_STRINGEOL 17 + #define SCE_FS_CONSTANT 18 + #define SCE_FS_ASM 19 + #define SCE_FS_LABEL 20 + #define SCE_FS_ERROR 21 + #define SCE_FS_HEXNUMBER 22 + #define SCE_FS_BINNUMBER 23 + #define SCE_CSOUND_DEFAULT 0 + #define SCE_CSOUND_COMMENT 1 + #define SCE_CSOUND_NUMBER 2 + #define SCE_CSOUND_OPERATOR 3 + #define SCE_CSOUND_INSTR 4 + #define SCE_CSOUND_IDENTIFIER 5 + #define SCE_CSOUND_OPCODE 6 + #define SCE_CSOUND_HEADERSTMT 7 + #define SCE_CSOUND_USERKEYWORD 8 + #define SCE_CSOUND_COMMENTBLOCK 9 + #define SCE_CSOUND_PARAM 10 + #define SCE_CSOUND_ARATE_VAR 11 + #define SCE_CSOUND_KRATE_VAR 12 + #define SCE_CSOUND_IRATE_VAR 13 + #define SCE_CSOUND_GLOBAL_VAR 14 + #define SCE_CSOUND_STRINGEOL 15 + #define SCLEX_ASP 29 + #define SCLEX_PHP 30 //--Autogenerated -- end of section automatically generated from Scintilla.iface |
