From: <td...@us...> - 2003-11-21 13:53:03
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1:/tmp/cvs-serv28167 Modified Files: AnyEdit.cpp AnyEdit.dsp AnyEditDoc.cpp AnyEditView.cpp BugReport.cpp ChangeLog.txt FindReplace.cpp ProjectTree.cpp SciLexer.h Scintilla.h WorkspaceBar.cpp scintillaif.cpp Log Message: FindReplace positions cursor after replaced text [#817192] Diff plugin interface bug fixed [#817195] Crash on lines > 2510 chars fixed [#799649] Updated to scintilla 1.56 File copies in temp folder are now deleted [#798515] Proper save of find and replace history done [#798521] Standalone file leaves garbage in class view - Fixed [#730650] Index: AnyEdit.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** AnyEdit.cpp 20 Nov 2003 15:47:49 -0000 1.31 --- AnyEdit.cpp 21 Nov 2003 13:53:00 -0000 1.32 *************** *** 431,437 **** --- 431,452 ---- (DWORD)dwHelpCookie) ; // Pass in cookie + if (m_ClassViewParserThread) delete m_ClassViewParserThread; m_ClassViewParserThread=NULL; + + //Delete all the files in the temp folder + CString pat = GetAppPath()+"temp\\"; + CStringArray farr; + msc.GetFilesInFolder(pat,"*.*",farr); + + for(int i=0;i<farr.GetSize();i++) + { + TRY{ + CString res = pat + farr[i]; + CFile::Remove(res); + }CATCH(CFileException, e){} + END_CATCH + } return CWinApp::ExitInstance(); Index: AnyEdit.dsp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.dsp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** AnyEdit.dsp 18 Nov 2003 11:27:21 -0000 1.23 --- AnyEdit.dsp 21 Nov 2003 13:53:00 -0000 1.24 *************** *** 44,48 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c ! # ADD CPP /nologo /MD /W3 /GX /Ox /I "C:\Program Files\HTML Help Workshop\INCLUDE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c # SUBTRACT CPP /Fr # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 44,48 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c ! # ADD CPP /nologo /MD /W4 /GX /Ox /I "C:\Program Files\HTML Help Workshop\INCLUDE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c # SUBTRACT CPP /Fr # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 72,76 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c ! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "C:\Program Files\HTML Help Workshop\INCLUDE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 72,76 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c ! # ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "C:\Program Files\HTML Help Workshop\INCLUDE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 Index: AnyEditDoc.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditDoc.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** AnyEditDoc.cpp 20 Nov 2003 15:47:49 -0000 1.11 --- AnyEditDoc.cpp 21 Nov 2003 13:53:00 -0000 1.12 *************** *** 105,109 **** HasBeenModified(FALSE); POSITION pos = GetFirstViewPosition(); ! CAnyEditView* pView; if(pos != NULL) { --- 105,109 ---- HasBeenModified(FALSE); POSITION pos = GetFirstViewPosition(); ! CAnyEditView* pView=NULL; if(pos != NULL) { Index: AnyEditView.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEditView.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** AnyEditView.cpp 20 Nov 2003 15:47:49 -0000 1.34 --- AnyEditView.cpp 21 Nov 2003 13:53:00 -0000 1.35 *************** *** 873,880 **** * Automatic commenting below */ ! char prevline[2500]; ! int dist = m_Scintilla.GetLine(m_Scintilla.GetCurLineNumber()-1,prevline); ! prevline[dist] = '\0'; ! CString str = prevline; str.TrimLeft(); str.TrimLeft('\t'); --- 873,886 ---- * Automatic commenting below */ ! CString str; ! char * prevline = (char *)malloc(m_Scintilla.LineLength(m_Scintilla.GetCurLineNumber()-1)); ! if(prevline!=NULL) ! { ! int dist = m_Scintilla.GetLine(m_Scintilla.GetCurLineNumber()-1,prevline); ! if(dist==0) dist++; ! prevline[dist-1] = '\0'; ! str = prevline; ! free(prevline); ! } str.TrimLeft(); str.TrimLeft('\t'); Index: BugReport.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/BugReport.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BugReport.cpp 27 Aug 2003 06:32:42 -0000 1.4 --- BugReport.cpp 21 Nov 2003 13:53:00 -0000 1.5 *************** *** 111,116 **** ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); ! ! if( !(bOsVersionInfoEx = GetVersionEx ((OSVERSIONINFO *) &osvi)) ) { // If OSVERSIONINFOEX doesn't work, try OSVERSIONINFO. --- 111,116 ---- ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); ! bOsVersionInfoEx = GetVersionEx ((OSVERSIONINFO *) &osvi); ! if( !(bOsVersionInfoEx) ) { // If OSVERSIONINFOEX doesn't work, try OSVERSIONINFO. Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ChangeLog.txt,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ChangeLog.txt 18 Nov 2003 11:27:22 -0000 1.30 --- ChangeLog.txt 21 Nov 2003 13:53:00 -0000 1.31 *************** *** 36,39 **** --- 36,49 ---- 29) Added option in replace to remove transform backslash expressions. 30) Class view display now shows more information [enums, macros, fields] etc., + 31) FindReplace positions cursor after replaced text [#817192] + 32) Diff plugin interface bug fixed [#817195] + 33) crash on lines > 2510 chars fixed [#799649] + 34) Updated to scintilla 1.56 + 35) File copies in temp folder are now deleted [#798515] + 36) Proper save of find and replace history done [#798521] + 37) Standalone file leaves garbage in class view - Fixed [#730650] + + + Thanks poto for your bug reports Beta 1.0 Index: FindReplace.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/FindReplace.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FindReplace.cpp 18 Nov 2003 04:09:50 -0000 1.7 --- FindReplace.cpp 21 Nov 2003 13:53:00 -0000 1.8 *************** *** 93,97 **** long endpos = m_scintilla->GetTargetEnd(); m_scintilla->SetSel(stpos,endpos); ! } } --- 93,97 ---- long endpos = m_scintilla->GetTargetEnd(); m_scintilla->SetSel(stpos,endpos); ! }else m_scintilla->SetSel(m_scintilla->GetTargetEnd(),m_scintilla->GetTargetEnd()); } *************** *** 126,130 **** comboStr = m_reg.GetProfileString(SEC_GREP,_T("LastFind"),tempStr,""); m_findcombo.SetWindowText(comboStr); ! m_check1.SetCheck(m_reg.GetProfileInt(SEC_GREP,_T("FCheck1"),0 )); m_check2.SetCheck(m_reg.GetProfileInt(SEC_GREP,_T("FCheck2"),0 )); --- 126,132 ---- comboStr = m_reg.GetProfileString(SEC_GREP,_T("LastFind"),tempStr,""); m_findcombo.SetWindowText(comboStr); ! comboStr = m_reg.GetProfileString(SEC_GREP,_T("LastReplace"),tempStr,""); ! m_replacecombo.SetWindowText(comboStr); ! m_check1.SetCheck(m_reg.GetProfileInt(SEC_GREP,_T("FCheck1"),0 )); m_check2.SetCheck(m_reg.GetProfileInt(SEC_GREP,_T("FCheck2"),0 )); *************** *** 223,226 **** --- 225,230 ---- m_replacecombo.AddString(str); + m_scintilla->SetCurrentPos(m_scintilla->GetCurrentPos()+str.GetLength()); + OnFindnext(); } *************** *** 315,318 **** --- 319,324 ---- m_findcombo.GetWindowText(tempStr); m_reg.WriteProfileString(SEC_GREP,_T("LastFind"),tempStr); + m_replacecombo.GetWindowText(tempStr); + m_reg.WriteProfileString(SEC_GREP,_T("LastReplace"),tempStr); tempStr.Empty(); *************** *** 336,340 **** for(int ii=0;ii<y;ii++) { ! m_findcombo.GetLBText(ii,lbStr); tempStr+= lbStr+_T("|"); } --- 342,346 ---- for(int ii=0;ii<y;ii++) { ! m_replacecombo.GetLBText(ii,lbStr); tempStr+= lbStr+_T("|"); } *************** *** 349,351 **** --- 355,359 ---- m_findcombo.GetWindowText(tempStr); m_reg.WriteProfileString(SEC_GREP,_T("LastFind"),tempStr); + m_replacecombo.GetWindowText(tempStr); + m_reg.WriteProfileString(SEC_GREP,_T("LastReplace"),tempStr); } Index: ProjectTree.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ProjectTree.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ProjectTree.cpp 8 May 2003 12:00:56 -0000 1.7 --- ProjectTree.cpp 21 Nov 2003 13:53:00 -0000 1.8 *************** *** 727,731 **** CString folName=strArr.GetAt(1); CString folPar = strArr.GetAt(2); ! HTREEITEM folItem; if(folPar==_T("ROOT")) --- 727,731 ---- CString folName=strArr.GetAt(1); CString folPar = strArr.GetAt(2); ! HTREEITEM folItem=NULL; if(folPar==_T("ROOT")) Index: SciLexer.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/SciLexer.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SciLexer.h 17 Jul 2003 11:32:15 -0000 1.3 --- SciLexer.h 21 Nov 2003 13:53:00 -0000 1.4 *************** *** 57,60 **** --- 57,71 ---- #define SCLEX_LOUT 40 #define SCLEX_ESCRIPT 41 + #define SCLEX_PS 42 + #define SCLEX_NSIS 43 + #define SCLEX_MMIXAL 44 + #define SCLEX_CLW 45 + #define SCLEX_CLWNOCASE 46 + #define SCLEX_LOT 47 + #define SCLEX_YAML 48 + #define SCLEX_TEX 49 + #define SCLEX_METAPOST 50 + #define SCLEX_POWERBASIC 51 + #define SCLEX_FORTH 52 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 *************** *** 269,272 **** --- 280,285 ---- #define SCE_LUA_WORD5 16 #define SCE_LUA_WORD6 17 + #define SCE_LUA_WORD7 18 + #define SCE_LUA_WORD8 19 #define SCE_ERR_DEFAULT 0 #define SCE_ERR_PYTHON 1 *************** *** 384,387 **** --- 397,412 ---- #define SCE_NNCRONTAB_ENVIRONMENT 9 #define SCE_NNCRONTAB_IDENTIFIER 10 + #define SCE_FORTH_DEFAULT 0 + #define SCE_FORTH_COMMENT 1 + #define SCE_FORTH_COMMENT_ML 2 + #define SCE_FORTH_IDENTIFIER 3 + #define SCE_FORTH_CONTROL 4 + #define SCE_FORTH_KEYWORD 5 + #define SCE_FORTH_DEFWORD 6 + #define SCE_FORTH_PREWORD1 7 + #define SCE_FORTH_PREWORD2 8 + #define SCE_FORTH_NUMBER 9 + #define SCE_FORTH_STRING 10 + #define SCE_FORTH_LOCALE 11 #define SCE_MATLAB_DEFAULT 0 #define SCE_MATLAB_COMMENT 1 *************** *** 393,415 **** #define SCE_MATLAB_IDENTIFIER 7 #define SCE_SCRIPTOL_DEFAULT 0 ! #define SCE_SCRIPTOL_COMMENT 1 #define SCE_SCRIPTOL_COMMENTLINE 2 ! #define SCE_SCRIPTOL_COMMENTDOC 3 ! #define SCE_SCRIPTOL_NUMBER 4 ! #define SCE_SCRIPTOL_WORD 5 ! #define SCE_SCRIPTOL_STRING 6 ! #define SCE_SCRIPTOL_CHARACTER 7 ! #define SCE_SCRIPTOL_UUID 8 ! #define SCE_SCRIPTOL_PREPROCESSOR 9 ! #define SCE_SCRIPTOL_OPERATOR 10 ! #define SCE_SCRIPTOL_IDENTIFIER 11 ! #define SCE_SCRIPTOL_STRINGEOL 12 ! #define SCE_SCRIPTOL_VERBATIM 13 ! #define SCE_SCRIPTOL_REGEX 14 ! #define SCE_SCRIPTOL_COMMENTLINEDOC 15 ! #define SCE_SCRIPTOL_WORD2 16 ! #define SCE_SCRIPTOL_COMMENTDOCKEYWORD 17 ! #define SCE_SCRIPTOL_COMMENTDOCKEYWORDERROR 18 ! #define SCE_SCRIPTOL_COMMENTBASIC 19 #define SCE_ASM_DEFAULT 0 #define SCE_ASM_COMMENT 1 --- 418,436 ---- #define SCE_MATLAB_IDENTIFIER 7 #define SCE_SCRIPTOL_DEFAULT 0 ! #define SCE_SCRIPTOL_WHITE 1 #define SCE_SCRIPTOL_COMMENTLINE 2 ! #define SCE_SCRIPTOL_PERSISTENT 3 ! #define SCE_SCRIPTOL_CSTYLE 4 ! #define SCE_SCRIPTOL_COMMENTBLOCK 5 ! #define SCE_SCRIPTOL_NUMBER 6 ! #define SCE_SCRIPTOL_STRING 7 ! #define SCE_SCRIPTOL_CHARACTER 8 ! #define SCE_SCRIPTOL_STRINGEOL 9 ! #define SCE_SCRIPTOL_KEYWORD 10 ! #define SCE_SCRIPTOL_OPERATOR 11 ! #define SCE_SCRIPTOL_IDENTIFIER 12 ! #define SCE_SCRIPTOL_TRIPLE 13 ! #define SCE_SCRIPTOL_CLASSNAME 14 ! #define SCE_SCRIPTOL_PREPROCESSOR 15 #define SCE_ASM_DEFAULT 0 #define SCE_ASM_COMMENT 1 *************** *** 423,426 **** --- 444,451 ---- #define SCE_ASM_DIRECTIVE 9 #define SCE_ASM_DIRECTIVEOPERAND 10 + #define SCE_ASM_COMMENTBLOCK 11 + #define SCE_ASM_CHARACTER 12 + #define SCE_ASM_STRINGEOL 13 + #define SCE_ASM_EXTINSTRUCTION 14 #define SCE_F_DEFAULT 0 #define SCE_F_COMMENT 1 *************** *** 456,467 **** #define SCE_POV_COMMENT 1 #define SCE_POV_COMMENTLINE 2 ! #define SCE_POV_COMMENTDOC 3 ! #define SCE_POV_NUMBER 4 ! #define SCE_POV_WORD 5 #define SCE_POV_STRING 6 ! #define SCE_POV_OPERATOR 7 ! #define SCE_POV_IDENTIFIER 8 ! #define SCE_POV_BRACE 9 #define SCE_POV_WORD2 10 #define SCE_LOUT_DEFAULT 0 #define SCE_LOUT_COMMENT 1 --- 481,498 ---- #define SCE_POV_COMMENT 1 #define SCE_POV_COMMENTLINE 2 ! #define SCE_POV_NUMBER 3 ! #define SCE_POV_OPERATOR 4 ! #define SCE_POV_IDENTIFIER 5 #define SCE_POV_STRING 6 ! #define SCE_POV_STRINGEOL 7 ! #define SCE_POV_DIRECTIVE 8 ! #define SCE_POV_BADDIRECTIVE 9 #define SCE_POV_WORD2 10 + #define SCE_POV_WORD3 11 + #define SCE_POV_WORD4 12 + #define SCE_POV_WORD5 13 + #define SCE_POV_WORD6 14 + #define SCE_POV_WORD7 15 + #define SCE_POV_WORD8 16 #define SCE_LOUT_DEFAULT 0 #define SCE_LOUT_COMMENT 1 *************** *** 487,490 **** --- 518,613 ---- #define SCE_ESCRIPT_WORD2 10 #define SCE_ESCRIPT_WORD3 11 + #define SCE_PS_DEFAULT 0 + #define SCE_PS_COMMENT 1 + #define SCE_PS_DSC_COMMENT 2 + #define SCE_PS_DSC_VALUE 3 + #define SCE_PS_NUMBER 4 + #define SCE_PS_NAME 5 + #define SCE_PS_KEYWORD 6 + #define SCE_PS_LITERAL 7 + #define SCE_PS_IMMEVAL 8 + #define SCE_PS_PAREN_ARRAY 9 + #define SCE_PS_PAREN_DICT 10 + #define SCE_PS_PAREN_PROC 11 + #define SCE_PS_TEXT 12 + #define SCE_PS_HEXSTRING 13 + #define SCE_PS_BASE85STRING 14 + #define SCE_PS_BADSTRINGCHAR 15 + #define SCE_NSIS_DEFAULT 0 + #define SCE_NSIS_COMMENT 1 + #define SCE_NSIS_STRINGDQ 2 + #define SCE_NSIS_STRINGLQ 3 + #define SCE_NSIS_STRINGRQ 4 + #define SCE_NSIS_FUNCTION 5 + #define SCE_NSIS_VARIABLE 6 + #define SCE_NSIS_LABEL 7 + #define SCE_NSIS_USERDEFINED 8 + #define SCE_NSIS_SECTIONDEF 9 + #define SCE_NSIS_SUBSECTIONDEF 10 + #define SCE_NSIS_IFDEFINEDEF 11 + #define SCE_NSIS_MACRODEF 12 + #define SCE_NSIS_STRINGVAR 13 + #define SCE_MMIXAL_LEADWS 0 + #define SCE_MMIXAL_COMMENT 1 + #define SCE_MMIXAL_LABEL 2 + #define SCE_MMIXAL_OPCODE 3 + #define SCE_MMIXAL_OPCODE_PRE 4 + #define SCE_MMIXAL_OPCODE_VALID 5 + #define SCE_MMIXAL_OPCODE_UNKNOWN 6 + #define SCE_MMIXAL_OPCODE_POST 7 + #define SCE_MMIXAL_OPERANDS 8 + #define SCE_MMIXAL_NUMBER 9 + #define SCE_MMIXAL_REF 10 + #define SCE_MMIXAL_CHAR 11 + #define SCE_MMIXAL_STRING 12 + #define SCE_MMIXAL_REGISTER 13 + #define SCE_MMIXAL_HEX 14 + #define SCE_MMIXAL_OPERATOR 15 + #define SCE_MMIXAL_SYMBOL 16 + #define SCE_MMIXAL_INCLUDE 17 + #define SCE_CLW_DEFAULT 0 + #define SCE_CLW_LABEL 1 + #define SCE_CLW_COMMENT 2 + #define SCE_CLW_STRING 3 + #define SCE_CLW_USER_IDENTIFIER 4 + #define SCE_CLW_INTEGER_CONSTANT 5 + #define SCE_CLW_REAL_CONSTANT 6 + #define SCE_CLW_PICTURE_STRING 7 + #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 + #define SCE_LOT_BREAK 2 + #define SCE_LOT_SET 3 + #define SCE_LOT_PASS 4 + #define SCE_LOT_FAIL 5 + #define SCE_LOT_ABORT 6 + #define SCE_YAML_DEFAULT 0 + #define SCE_YAML_COMMENT 1 + #define SCE_YAML_IDENTIFIER 2 + #define SCE_YAML_KEYWORD 3 + #define SCE_YAML_NUMBER 4 + #define SCE_YAML_REFERENCE 5 + #define SCE_YAML_DOCUMENT 6 + #define SCE_YAML_TEXT 7 + #define SCE_YAML_ERROR 8 + #define SCE_TEX_DEFAULT 0 + #define SCE_TEX_SPECIAL 1 + #define SCE_TEX_GROUP 2 + #define SCE_TEX_SYMBOL 3 + #define SCE_TEX_COMMAND 4 + #define SCE_TEX_TEXT 5 + #define SCE_METAPOST_DEFAULT 0 + #define SCE_METAPOST_SPECIAL 1 + #define SCE_METAPOST_GROUP 2 + #define SCE_METAPOST_SYMBOL 3 + #define SCE_METAPOST_COMMAND 4 + #define SCE_METAPOST_TEXT 5 + #define SCE_METAPOST_EXTRA 6 //--Autogenerated -- end of section automatically generated from Scintilla.iface Index: Scintilla.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/Scintilla.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Scintilla.h 17 Jul 2003 11:32:15 -0000 1.6 --- Scintilla.h 21 Nov 2003 13:53:00 -0000 1.7 *************** *** 205,208 **** --- 205,210 ---- #define INDIC_DIAGONAL 3 #define INDIC_STRIKE 4 + #define INDIC_HIDDEN 5 + #define INDIC_BOX 6 #define INDIC0_MASK 0x20 #define INDIC1_MASK 0x40 *************** *** 533,536 **** --- 535,539 ---- #define SCI_SETHOTSPOTACTIVEBACK 2411 #define SCI_SETHOTSPOTACTIVEUNDERLINE 2412 + #define SCI_SETHOTSPOTSINGLELINE 2421 #define SCI_PARADOWN 2413 #define SCI_PARADOWNEXTEND 2414 *************** *** 541,544 **** --- 544,563 ---- #define SCI_COPYRANGE 2419 #define SCI_COPYTEXT 2420 + #define SC_SEL_STREAM 0 + #define SC_SEL_RECTANGLE 1 + #define SC_SEL_LINES 2 + #define SCI_SETSELECTIONMODE 2422 + #define SCI_GETSELECTIONMODE 2423 + #define SCI_GETLINESELSTARTPOSITION 2424 + #define SCI_GETLINESELENDPOSITION 2425 + #define SCI_LINEDOWNRECTEXTEND 2426 + #define SCI_LINEUPRECTEXTEND 2427 + #define SCI_CHARLEFTRECTEXTEND 2428 + #define SCI_CHARRIGHTRECTEXTEND 2429 + #define SCI_HOMERECTEXTEND 2430 + #define SCI_VCHOMERECTEXTEND 2431 + #define SCI_LINEENDRECTEXTEND 2432 + #define SCI_PAGEUPRECTEXTEND 2433 + #define SCI_PAGEDOWNRECTEXTEND 2434 #define SCI_STARTRECORD 3001 #define SCI_STOPRECORD 3002 *************** *** 547,550 **** --- 566,570 ---- #define SCI_COLOURISE 4003 #define SCI_SETPROPERTY 4004 + #define KEYWORDSET_MAX 8 #define SCI_SETKEYWORDS 4005 #define SCI_SETLEXERLANGUAGE 4006 Index: WorkspaceBar.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/WorkspaceBar.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** WorkspaceBar.cpp 11 Aug 2003 04:03:19 -0000 1.21 --- WorkspaceBar.cpp 21 Nov 2003 13:53:00 -0000 1.22 *************** *** 458,462 **** //clean up of temporary files for(i=0;i<m_ParserTemporaryFile.GetSize();i++) ! remove(m_ParserTemporaryFile.GetAt(i)); } --- 458,465 ---- //clean up of temporary files for(i=0;i<m_ParserTemporaryFile.GetSize();i++) ! { ! remove(m_ParserTemporaryFile.GetAt(i)); ! } ! } *************** *** 520,523 **** //clean up of temporary files for(int i=0;i<m_ParserTemporaryFile.GetSize();i++) ! remove(m_ParserTemporaryFile.GetAt(i)); } --- 523,528 ---- //clean up of temporary files for(int i=0;i<m_ParserTemporaryFile.GetSize();i++) ! { ! remove(m_ParserTemporaryFile.GetAt(i)); ! } } Index: scintillaif.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/scintillaif.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** scintillaif.cpp 17 Jul 2003 11:32:16 -0000 1.8 --- scintillaif.cpp 21 Nov 2003 13:53:00 -0000 1.9 *************** *** 441,445 **** long CScintilla::GetCurrentPos() { ! return SPerform(SCI_GETCURRENTPOS, 0, 0); } --- 441,445 ---- long CScintilla::GetCurrentPos() { ! return SPerform(SCI_GETCURRENTPOS, 0, 0); } |