Menu
▾
▴
[Anyedit-cvs]AnyEditv2 SciLexer.h,1.8,1.9 Scintilla.h,1.12,1.13 SyntaxFile.cpp,1.26,1.27 scintillaif.cpp,1.19,1.20 scintillaif.h,1.15,1.16
|
From: Leon W. <moo...@us...> - 2005-04-11 08:20:54
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10177 Modified Files: SciLexer.h Scintilla.h SyntaxFile.cpp scintillaif.cpp scintillaif.h Log Message: - Upgrade to Scintilla 1.63 Index: scintillaif.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/scintillaif.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** scintillaif.cpp 27 Nov 2004 15:16:00 -0000 1.19 --- scintillaif.cpp 11 Apr 2005 08:20:27 -0000 1.20 *************** *** 1172,1175 **** --- 1172,1195 ---- } + void CScintilla::AutoCSetMaxWidth(int characterCount) + { + SPerform(SCI_AUTOCSETMAXWIDTH, (long)characterCount, 0); + } + + int CScintilla::AutoCGetMaxWidth() + { + return (int)SPerform(SCI_AUTOCGETMAXWIDTH, 0, 0); + } + + void CScintilla::AutoCSetMaxHeight(int rowCount) + { + SPerform(SCI_AUTOCSETMAXHEIGHT, (long)rowCount, 0); + } + + int CScintilla::AutoCGetMaxHeight() + { + return (int)SPerform(SCI_AUTOCGETMAXHEIGHT, 0, 0); + } + void CScintilla::SetIndent(int indentSize) { *************** *** 1607,1610 **** --- 1627,1635 ---- } + int CScintilla::WrapCount(int line) + { + return (int)SPerform(SCI_WRAPCOUNT, (long)line, 0); + } + void CScintilla::SetFoldLevel(int line, int level) { *************** *** 2597,2600 **** --- 2622,2640 ---- } + bool CScintilla::GetCaretSticky() + { + return SPerform(SCI_GETCARETSTICKY, 0, 0) != 0; + } + + void CScintilla::SetCaretSticky(bool useCaretStickyBehaviour) + { + SPerform(SCI_SETCARETSTICKY, (long)useCaretStickyBehaviour, 0); + } + + void CScintilla::ToggleCaretSticky() + { + SPerform(SCI_TOGGLECARETSTICKY, 0, 0); + } + void CScintilla::StartRecord() { Index: scintillaif.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/scintillaif.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** scintillaif.h 27 Nov 2004 15:16:00 -0000 1.15 --- scintillaif.h 11 Apr 2005 08:20:27 -0000 1.16 *************** *** 681,684 **** --- 681,702 ---- void AutoCSetTypeSeparator(int separatorCharacter); /** + * Set the maximum width, in characters, of auto-completion and user lists. + * Set to 0 to autosize to fit longest item, which is the default. + */ + void AutoCSetMaxWidth(int characterCount); + /** + * Get the maximum width, in characters, of auto-completion and user lists. + */ + int AutoCGetMaxWidth(); + /** + * Set the maximum height, in rows, of auto-completion and user lists. + * The default is 5 rows. + */ + void AutoCSetMaxHeight(int rowCount); + /** + * Set the maximum height, in rows, of auto-completion and user lists. + */ + int AutoCGetMaxHeight(); + /** * Set the number of spaces used for one level of indentation. */ *************** *** 1047,1050 **** --- 1065,1072 ---- int DocLineFromVisible(int lineDisplay); /** + * The number of display lines needed to wrap a document line + */ + int WrapCount(int line); + /** * Set the fold level of a line. * This encodes an integer level along with flags indicating whether the *************** *** 1903,1906 **** --- 1925,1940 ---- int FindColumn(int line, int column); /** + * Can the caret preferred x position only be changed by explicit movement commands? + */ + bool GetCaretSticky(); + /** + * Stop the caret preferred x position changing when the user types. + */ + void SetCaretSticky(bool useCaretStickyBehaviour); + /** + * Switch between sticky and non-sticky: meant to be bound to a key. + */ + void ToggleCaretSticky(); + /** * Start notifying the container of all key presses and commands. */ Index: SyntaxFile.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SyntaxFile.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** SyntaxFile.cpp 11 Apr 2005 06:52:58 -0000 1.26 --- SyntaxFile.cpp 11 Apr 2005 08:20:27 -0000 1.27 *************** *** 358,361 **** --- 358,366 ---- if( name == "SCLEX_ASN1" ) return SCLEX_ASN1; if( name == "SCLEX_VHDL" ) return SCLEX_VHDL; + if( name == "SCLEX_CAML" ) return SCLEX_CAML; + if( name == "SCLEX_BLITZBASIC" ) return SCLEX_BLITZBASIC; + if( name == "SCLEX_PUREBASIC" ) return SCLEX_PUREBASIC; + if( name == "SCLEX_HASKELL" ) return SCLEX_HASKELL; + if( name == "SCLEX_PHPSCRIPT" ) return SCLEX_PHPSCRIPT; for( i = 0; i < name.GetLength(); ++ i ) Index: Scintilla.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/Scintilla.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Scintilla.h 27 Nov 2004 15:15:05 -0000 1.12 --- Scintilla.h 11 Apr 2005 08:20:26 -0000 1.13 *************** *** 12,15 **** --- 12,19 ---- #define SCINTILLA_H + #if LCCWIN + typedef BOOL bool; + #endif + #if PLAT_WIN // Return false on failure: *************** *** 252,255 **** --- 256,263 ---- #define SCI_AUTOCGETTYPESEPARATOR 2285 #define SCI_AUTOCSETTYPESEPARATOR 2286 + #define SCI_AUTOCSETMAXWIDTH 2208 + #define SCI_AUTOCGETMAXWIDTH 2209 + #define SCI_AUTOCSETMAXHEIGHT 2210 + #define SCI_AUTOCGETMAXHEIGHT 2211 #define SCI_SETINDENT 2122 #define SCI_GETINDENT 2123 *************** *** 349,352 **** --- 357,361 ---- #define SCI_VISIBLEFROMDOCLINE 2220 #define SCI_DOCLINEFROMVISIBLE 2221 + #define SCI_WRAPCOUNT 2235 #define SC_FOLDLEVELBASE 0x400 #define SC_FOLDLEVELWHITEFLAG 0x1000 *************** *** 387,390 **** --- 396,400 ---- #define SC_WRAP_NONE 0 #define SC_WRAP_WORD 1 + #define SC_WRAP_CHAR 2 #define SCI_SETWRAPMODE 2268 #define SCI_GETWRAPMODE 2269 *************** *** 588,591 **** --- 598,604 ---- #define SCI_ENCODEDFROMUTF8 2449 #define SCI_FINDCOLUMN 2456 + #define SCI_GETCARETSTICKY 2457 + #define SCI_SETCARETSTICKY 2458 + #define SCI_TOGGLECARETSTICKY 2459 #define SCI_STARTRECORD 3001 #define SCI_STOPRECORD 3002 *************** *** 654,657 **** --- 667,671 ---- #define SCN_HOTSPOTDOUBLECLICK 2020 #define SCN_CALLTIPCLICK 2021 + #define SCN_AUTOCSELECTION 2022 //--Autogenerated -- end of section automatically generated from Scintilla.iface *************** *** 706,710 **** int modifiers; // SCN_KEY int modificationType; // SCN_MODIFIED ! const char *text; // SCN_MODIFIED int length; // SCN_MODIFIED int linesAdded; // SCN_MODIFIED --- 720,724 ---- int modifiers; // SCN_KEY int modificationType; // SCN_MODIFIED ! const char *text; // SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION int length; // SCN_MODIFIED int linesAdded; // SCN_MODIFIED *************** *** 721,729 **** }; ! // Deprecation section listing all API features that are deprecated and will ! // will be removed completely in a future version. ! // To enable these features define INCLUDE_DEPRECATED_FEATURES ! ! // ##### #define SCI_SETPARENTSCROLL 2500 #define SCN_GETSCROLLINFO 2100 --- 735,739 ---- }; ! // --- Patch for AnyEdit #define SCI_SETPARENTSCROLL 2500 #define SCN_GETSCROLLINFO 2100 *************** *** 732,736 **** #define SCROLLBAR_HORZ 0x4000 ! #if PLAT_WIN #define SCI_SCROLLBAR(x) ((x & SCROLLBAR_VERT) ? SB_VERT : (x & SCROLLBAR_HORZ) ? SB_HORZ : 0) #define SCI_SCROLL_REDRAW(x) ((x & 1) ? TRUE : FALSE) --- 742,746 ---- #define SCROLLBAR_HORZ 0x4000 ! #ifdef WIN32 #define SCI_SCROLLBAR(x) ((x & SCROLLBAR_VERT) ? SB_VERT : (x & SCROLLBAR_HORZ) ? SB_HORZ : 0) #define SCI_SCROLL_REDRAW(x) ((x & 1) ? TRUE : FALSE) *************** *** 738,742 **** #define SCI_MAKESCROLLMSG_REDRAW(bar, redraw) ((redraw ? 1 : 0) | (SCI_MAKESCROLLMSG(bar))) #endif ! // ##### #ifdef INCLUDE_DEPRECATED_FEATURES --- 748,756 ---- #define SCI_MAKESCROLLMSG_REDRAW(bar, redraw) ((redraw ? 1 : 0) | (SCI_MAKESCROLLMSG(bar))) #endif ! // --- End of Patch for AnyEdit ! ! // Deprecation section listing all API features that are deprecated and will ! // will be removed completely in a future version. ! // To enable these features define INCLUDE_DEPRECATED_FEATURES #ifdef INCLUDE_DEPRECATED_FEATURES Index: SciLexer.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SciLexer.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SciLexer.h 27 Nov 2004 15:13:45 -0000 1.8 --- SciLexer.h 11 Apr 2005 08:20:22 -0000 1.9 *************** *** 80,83 **** --- 80,88 ---- #define SCLEX_ASN1 63 #define SCLEX_VHDL 64 + #define SCLEX_CAML 65 + #define SCLEX_BLITZBASIC 66 + #define SCLEX_PUREBASIC 67 + #define SCLEX_HASKELL 68 + #define SCLEX_PHPSCRIPT 69 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 *************** *** 271,274 **** --- 276,283 ---- #define SCE_B_CONSTANT 13 #define SCE_B_ASM 14 + #define SCE_B_LABEL 15 + #define SCE_B_ERROR 16 + #define SCE_B_HEXNUMBER 17 + #define SCE_B_BINNUMBER 18 #define SCE_PROPS_DEFAULT 0 #define SCE_PROPS_COMMENT 1 *************** *** 503,506 **** --- 512,516 ---- #define SCE_CSS_SINGLESTRING 14 #define SCE_CSS_IDENTIFIER2 15 + #define SCE_CSS_ATTRIBUTE 16 #define SCE_POV_DEFAULT 0 #define SCE_POV_COMMENT 1 *************** *** 574,577 **** --- 584,591 ---- #define SCE_NSIS_STRINGVAR 13 #define SCE_NSIS_NUMBER 14 + #define SCE_NSIS_SECTIONGROUP 15 + #define SCE_NSIS_PAGEEX 16 + #define SCE_NSIS_FUNCTIONDEF 17 + #define SCE_NSIS_COMMENTBOX 18 #define SCE_MMIXAL_LEADWS 0 #define SCE_MMIXAL_COMMENT 1 *************** *** 602,610 **** #define SCE_CLW_KEYWORD 8 #define SCE_CLW_COMPILER_DIRECTIVE 9 ! #define SCE_CLW_BUILTIN_PROCEDURES_FUNCTION 10 ! #define SCE_CLW_STRUCTURE_DATA_TYPE 11 ! #define SCE_CLW_ATTRIBUTE 12 ! #define SCE_CLW_STANDARD_EQUATE 13 ! #define SCE_CLW_ERROR 14 #define SCE_LOT_DEFAULT 0 #define SCE_LOT_HEADER 1 --- 616,626 ---- #define SCE_CLW_KEYWORD 8 #define SCE_CLW_COMPILER_DIRECTIVE 9 ! #define SCE_CLW_RUNTIME_EXPRESSIONS 10 ! #define SCE_CLW_BUILTIN_PROCEDURES_FUNCTION 11 ! #define SCE_CLW_STRUCTURE_DATA_TYPE 12 ! #define SCE_CLW_ATTRIBUTE 13 ! #define SCE_CLW_STANDARD_EQUATE 14 ! #define SCE_CLW_ERROR 15 ! #define SCE_CLW_DEPRECATED 16 #define SCE_LOT_DEFAULT 0 #define SCE_LOT_HEADER 1 *************** *** 732,735 **** --- 748,752 ---- #define SCE_AU3_PREPROCESSOR 11 #define SCE_AU3_SPECIAL 12 + #define SCE_AU3_EXPAND 13 #define SCE_APDL_DEFAULT 0 #define SCE_APDL_COMMENT 1 *************** *** 785,788 **** --- 802,836 ---- #define SCE_VHDL_STDTYPE 13 #define SCE_VHDL_USERWORD 14 + #define SCE_CAML_DEFAULT 0 + #define SCE_CAML_IDENTIFIER 1 + #define SCE_CAML_TAGNAME 2 + #define SCE_CAML_KEYWORD 3 + #define SCE_CAML_KEYWORD2 4 + #define SCE_CAML_LINENUM 5 + #define SCE_CAML_OPERATOR 6 + #define SCE_CAML_NUMBER 7 + #define SCE_CAML_CHAR 8 + #define SCE_CAML_STRING 9 + #define SCE_CAML_COMMENT 10 + #define SCE_CAML_COMMENT1 11 + #define SCE_CAML_COMMENT2 12 + #define SCE_CAML_COMMENT3 13 + #define SCE_HA_DEFAULT 0 + #define SCE_HA_IDENTIFIER 1 + #define SCE_HA_KEYWORD 2 + #define SCE_HA_NUMBER 3 + #define SCE_HA_STRING 4 + #define SCE_HA_CHARACTER 5 + #define SCE_HA_CLASS 6 + #define SCE_HA_MODULE 7 + #define SCE_HA_CAPITAL 8 + #define SCE_HA_DATA 9 + #define SCE_HA_IMPORT 10 + #define SCE_HA_OPERATOR 11 + #define SCE_HA_INSTANCE 12 + #define SCE_HA_COMMENTLINE 13 + #define SCE_HA_COMMENTBLOCK 14 + #define SCE_HA_COMMENTBLOCK2 15 + #define SCE_HA_COMMENTBLOCK3 16 //--Autogenerated -- end of section automatically generated from Scintilla.iface |
