Menu
▾
▴
[Win32forth-cvs] win32forth-extsrc/extsrc/w32fScintilla/win32 PlatWin.cxx,1.1,1.2 ScintRes.aps,1.2,1.3 ScintRes.rc,1.2,1.3 ScintillaWin.cxx,1.1,1.2 deps.mak,1.1,1.2 makefile,1.1,1.2 scintilla.mak,1.1,1.2 scintilla_vc6.mak,1.1,1.2
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30133/extsrc/w32fScintilla/win32 Modified Files: PlatWin.cxx ScintRes.aps ScintRes.rc ScintillaWin.cxx deps.mak makefile scintilla.mak scintilla_vc6.mak Log Message: w32fScintilla.dll updated to use the latest Version 1.66 of the scintilla control. Index: PlatWin.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/PlatWin.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlatWin.cxx 22 Dec 2004 20:26:00 -0000 1.1 --- PlatWin.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 377,381 **** fontOld = 0; } ! font =0; if (bitmapOld) { ::SelectObject(reinterpret_cast<HDC>(hdc), bitmapOld); --- 377,381 ---- fontOld = 0; } ! font = 0; if (bitmapOld) { [...1157 lines suppressed...] WNDCLASSEX wndclassc; wndclassc.cbSize = sizeof(wndclassc); + // We need CS_HREDRAW and CS_VREDRAW because of the ellipsis that might be drawn for + // truncated items in the list and the appearance/disappearance of the vertical scroll bar. + // The list repaint is double-buffered to avoid the flicker this would otherwise cause. wndclassc.style = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW; wndclassc.cbClsExtra = 0; *************** *** 1442,1446 **** void Platform_Initialise(void *hInstance) { ! OSVERSIONINFO osv = {sizeof(OSVERSIONINFO),0,0,0,0,""}; ::GetVersionEx(&osv); onNT = osv.dwPlatformId == VER_PLATFORM_WIN32_NT; --- 1977,1981 ---- void Platform_Initialise(void *hInstance) { ! OSVERSIONINFO osv = {sizeof(OSVERSIONINFO),0,0,0,0,TEXT("")}; ::GetVersionEx(&osv); onNT = osv.dwPlatformId == VER_PLATFORM_WIN32_NT; Index: makefile =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile 22 Dec 2004 20:26:00 -0000 1.1 --- makefile 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- CC = g++ DLLWRAP = dllwrap + DEL = del /q COMPONENT = ../bin/Scintilla.dll *************** *** 25,33 **** vpath %.cxx ../src ! LDFLAGS=-mwindows -lstdc++ -limm32 -lole32 -luuid # Add -MMD to get dependencies #CXXFLAGS = -g -pg -pedantic -Os -fno-exceptions -fvtable-thunks -fno-rtti INCLUDEDIRS=-I ../include -I ../src ! CXXBASEFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions $(THUNKFLAGS) -fno-rtti ifdef DEBUG --- 26,34 ---- vpath %.cxx ../src ! LDFLAGS=-mwindows -lstdc++ -limm32 -lole32 -luuid -mno-cygwin # Add -MMD to get dependencies #CXXFLAGS = -g -pg -pedantic -Os -fno-exceptions -fvtable-thunks -fno-rtti INCLUDEDIRS=-I ../include -I ../src ! CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic $(INCLUDEDIRS) -Os -fno-exceptions $(THUNKFLAGS) -fno-rtti -mno-cygwin ifdef DEBUG *************** *** 43,47 **** clean: ! del /q *.exe *.o *.obj *.dll *.res *.map deps: --- 44,48 ---- clean: ! $(DEL) *.exe *.o *.obj *.dll *.res *.map deps: *************** *** 51,61 **** #**LEXOBJS=\\\n\(\*.o \) LEXOBJS=\ ! LexAda.o LexAPDL.o LexAsm.o LexAU3.o LexAVE.o LexBaan.o LexBash.o LexBullant.o \ ! LexCLW.o LexConf.o LexCPP.o LexCrontab.o LexCSS.o LexEiffel.o LexErlang.o \ ! LexEScript.o LexForth.o LexFortran.o LexGui4Cli.o LexHTML.o LexKix.o LexLisp.o \ LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \ ! LexPython.o LexRuby.o LexScriptol.o LexSpecman.o LexSQL.o LexTeX.o LexVB.o \ ! LexVerilog.o LexYAML.o #--Autogenerated -- end of automatically generated section --- 52,63 ---- #**LEXOBJS=\\\n\(\*.o \) LEXOBJS=\ ! LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o LexBash.o \ ! LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexConf.o LexCPP.o LexCrontab.o \ ! LexCsound.o LexCSS.o LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o \ ! LexForth.o LexFortran.o LexGui4Cli.o LexHaskell.o LexHTML.o LexKix.o LexLisp.o \ LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \ LexNsis.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPOV.o LexPS.o \ ! LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o \ ! LexSQL.o LexTADS3.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o #--Autogenerated -- end of automatically generated section Index: ScintRes.aps =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/ScintRes.aps,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsYCYIkB and /tmp/cvsc0EJcW differ Index: ScintillaWin.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/ScintillaWin.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaWin.cxx 22 Dec 2004 20:26:00 -0000 1.1 --- ScintillaWin.cxx 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 185,188 **** --- 185,189 ---- virtual bool HaveMouseCapture(); virtual void ScrollText(int linesToMove); + virtual void UpdateSystemCaret(); virtual void SetVerticalScrollPos(); virtual void SetHorizontalScrollPos(); *************** *** 199,204 **** virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); virtual void ClaimSelection(); - virtual int KeyDefault(int key, int modifiers); // 4.7.2004 dbu - void NotifyKey(int key, int modifiers); // 4.7.2004 dbu // DBCS --- 200,203 ---- *************** *** 206,210 **** void ImeEndComposition(); ! void AddCharBytes(char b0, char b1=0); void GetIntelliMouseParameters(); --- 205,209 ---- void ImeEndComposition(); ! void AddCharBytes(char b0, char b1); void GetIntelliMouseParameters(); *************** *** 214,217 **** --- 213,218 ---- void RealizeWindowPalette(bool inBackGround); void FullPaint(); + void FullPaintDC(HDC dc); + bool IsCompatibleDC(HDC dc); virtual int SetScrollInfo(int nBar, LPCSCROLLINFO lpsi, BOOL bRedraw); *************** *** 254,257 **** --- 255,267 ---- return drag.rectangular && (fmt == cfColumnSelect); } + + private: + // For use in creating a system caret + bool HasCaretSizeChanged(); + BOOL CreateSystemCaret(); + BOOL DestroySystemCaret(); + HBITMAP sysCaretBitmap; + int sysCaretWidth; + int sysCaretHeight; }; *************** *** 279,282 **** --- 289,296 ---- dt.sci = this; + sysCaretBitmap = 0; + sysCaretWidth = 0; + sysCaretHeight = 0; + Initialise(); } *************** *** 295,298 **** --- 309,313 ---- SetTicking(false); SetIdle(false); + DestroySystemCaret(); ::RevokeDragDrop(MainHWND()); ::OleUninitialize(); *************** *** 432,437 **** return 0; #else ! sptr_t ret; ! if ((lParam & GCS_RESULTSTR) && (IsNT())) { HIMC hIMC = ::ImmGetContext(MainHWND()); if (hIMC) { --- 447,451 ---- return 0; #else ! if (lParam & GCS_RESULTSTR) { HIMC hIMC = ::ImmGetContext(MainHWND()); if (hIMC) { *************** *** 455,476 **** } } ::ImmReleaseContext(MainHWND(), hIMC); } ! ret = 0; ! } else { ! ret = ::DefWindowProc(MainHWND(), WM_IME_COMPOSITION, wParam, lParam); ! } ! if ((lParam & GCS_RESULTSTR)) { ! HIMC hIMC = ::ImmGetContext(MainHWND()); ! Point pos = LocationFromPosition(currentPos); ! COMPOSITIONFORM CompForm; ! CompForm.dwStyle = CFS_POINT; ! CompForm.ptCurrentPos.x = pos.x; ! CompForm.ptCurrentPos.y = pos.y; ! ::ImmSetCompositionWindow(hIMC, &CompForm); ! ::ImmReleaseContext(MainHWND(), hIMC); ! DropCaret(); ! } ! return ret; #endif } --- 469,484 ---- } } + // Set new position after converted + Point pos = LocationFromPosition(currentPos); + COMPOSITIONFORM CompForm; + CompForm.dwStyle = CFS_POINT; + CompForm.ptCurrentPos.x = pos.x; + CompForm.ptCurrentPos.y = pos.y; + ::ImmSetCompositionWindow(hIMC, &CompForm); ::ImmReleaseContext(MainHWND(), hIMC); } ! return 0; ! } ! return ::DefWindowProc(MainHWND(), WM_IME_COMPOSITION, wParam, lParam); #endif } *************** *** 520,532 **** case WM_COMMAND: #ifdef TOTAL_CONTROL - if (LoWord(wParam) == idAutoComplete) { - int cmd = HiWord(wParam); - if (cmd == LBN_DBLCLK) { - AutoCompleteCompleted(); - } else { - if (cmd != LBN_SETFOCUS) - ::SetFocus(MainHWND()); - } - } Command(LoWord(wParam)); #endif --- 528,531 ---- *************** *** 536,539 **** --- 535,547 ---- return WndPaint(wParam); + case WM_PRINTCLIENT: { + HDC hdc = reinterpret_cast<HDC>(wParam); + if (!IsCompatibleDC(hdc)) { + return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam); + } + FullPaintDC(hdc); + } + break; + case WM_VSCROLL: ScrollMessage(wParam); *************** *** 626,630 **** return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam); ! case WM_LBUTTONDOWN: //Platform::DebugPrintf("Buttdown %d %x %x %x %x %x\n",iMessage, wParam, lParam, // Platform::IsKeyDown(VK_SHIFT), --- 634,643 ---- return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam); ! case WM_LBUTTONDOWN: { ! // For IME, set the composition string as the result string. ! HIMC hIMC = ::ImmGetContext(MainHWND()); ! ::ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); ! ::ImmReleaseContext(MainHWND(), hIMC); ! // //Platform::DebugPrintf("Buttdown %d %x %x %x %x %x\n",iMessage, wParam, lParam, // Platform::IsKeyDown(VK_SHIFT), *************** *** 636,639 **** --- 649,653 ---- Platform::IsKeyDown(VK_MENU)); ::SetFocus(MainHWND()); + } break; *************** *** 681,690 **** //UTF8FromUCS2(wcs, 1, utfval, len); //AddCharUTF(utfval, len); ! AddCharBytes(static_cast<char>(wParam & 0xff)); } else { ! AddChar(static_cast<char>(wParam & 0xff)); } } ! return 1; case WM_UNICHAR: --- 695,704 ---- //UTF8FromUCS2(wcs, 1, utfval, len); //AddCharUTF(utfval, len); ! AddCharBytes('\0', LOBYTE(wParam)); } else { ! AddChar(LOBYTE(wParam)); } } ! return 0; case WM_UNICHAR: *************** *** 740,748 **** case WM_KILLFOCUS: { HWND wOther = reinterpret_cast<HWND>(wParam); ! HWND wThis = reinterpret_cast<HWND>(wMain.GetID()); HWND wCT = reinterpret_cast<HWND>(ct.wCallTip.GetID()); if (!wParam || !(::IsChild(wThis,wOther) || (wOther == wCT))) { SetFocusState(false); } } --- 754,763 ---- case WM_KILLFOCUS: { HWND wOther = reinterpret_cast<HWND>(wParam); ! HWND wThis = MainHWND(); HWND wCT = reinterpret_cast<HWND>(ct.wCallTip.GetID()); if (!wParam || !(::IsChild(wThis,wOther) || (wOther == wCT))) { SetFocusState(false); + DestroySystemCaret(); } } *************** *** 753,756 **** --- 768,773 ---- SetFocusState(true); RealizeWindowPalette(false); + DestroySystemCaret(); + CreateSystemCaret(); break; *************** *** 784,791 **** case WM_IME_CHAR: { ! if (HIBYTE(wParam) == '\0') ! AddChar(LOBYTE(wParam)); ! else ! AddCharBytes(HIBYTE(wParam), LOBYTE(wParam)); return 0; } --- 801,805 ---- case WM_IME_CHAR: { ! AddCharBytes(HIBYTE(wParam), LOBYTE(wParam)); return 0; } *************** *** 891,895 **** CharacterRange *pCR = reinterpret_cast<CharacterRange *>(lParam); selType = selStream; ! if (pCR->cpMax == 0 && pCR->cpMax == -1) { SetSelection(pCR->cpMin, pdoc->Length()); } else { --- 905,909 ---- CharacterRange *pCR = reinterpret_cast<CharacterRange *>(lParam); selType = selStream; ! if (pCR->cpMin == 0 && pCR->cpMax == -1) { SetSelection(pCR->cpMin, pdoc->Length()); } else { *************** *** 981,984 **** --- 995,1009 ---- } + void ScintillaWin::UpdateSystemCaret() { + if (hasFocus) { + if (HasCaretSizeChanged()) { + DestroySystemCaret(); + CreateSystemCaret(); + } + Point pos = LocationFromPosition(currentPos); + ::SetCaretPos(pos.x, pos.y); + } + } + int ScintillaWin::SetScrollInfo(int nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) { return ::SetScrollInfo(MainHWND(), nBar, lpsi, bRedraw); *************** *** 997,1000 **** --- 1022,1026 ---- GetScrollInfo(barType, &sci); if (sci.nPos != pos) { + DwellEnd(true); sci.nPos = pos; SetScrollInfo(barType, &sci, TRUE); *************** *** 1097,1119 **** } - // added 4.7.2004 dbu - void ScintillaWin::NotifyKey(int key, int modifiers) { - static SCNotification scn; - - memset( &scn, 0, sizeof(SCNotification) ); - scn.nmhdr.code = SCN_KEY; - scn.ch = key; - scn.modifiers = modifiers; - - NotifyParent(scn); - } - - // added 4.7.2004 dbu - int ScintillaWin::KeyDefault(int key, int modifiers) { - NotifyKey( key, modifiers ); - return 0; - } - - void ScintillaWin::Copy() { //Platform::DebugPrintf("Copy\n"); --- 1123,1126 ---- *************** *** 1135,1174 **** } void ScintillaWin::Paste() { ! if (!::OpenClipboard(MainHWND())) return; pdoc->BeginUndoAction(); - int selStart = SelectionStart(); ClearSelection(); bool isRectangular = ::IsClipboardFormatAvailable(cfColumnSelect) != 0; ! HGLOBAL hmemUSelection = 0; ! if (IsUnicodeMode()) { ! hmemUSelection = ::GetClipboardData(CF_UNICODETEXT); ! if (hmemUSelection) { ! wchar_t *uptr = static_cast<wchar_t *>(::GlobalLock(hmemUSelection)); ! if (uptr) { unsigned int bytes = ::GlobalSize(hmemUSelection); ! unsigned int len = UTF8Length(uptr, bytes/2); ! char *putf = new char[len+1]; if (putf) { ! UTF8FromUCS2(uptr, bytes/2, putf, len); ! if (isRectangular) { ! PasteRectangular(selStart, putf, len); ! } else { ! if (pdoc->InsertString(currentPos, putf, len)) { ! SetEmptySelection(currentPos + len); ! } } - delete []putf; } } - ::GlobalUnlock(hmemUSelection); } ! } ! if (!hmemUSelection) { HGLOBAL hmemSelection = ::GetClipboardData(CF_TEXT); if (hmemSelection) { char *ptr = static_cast<char *>( ! ::GlobalLock(hmemSelection)); if (ptr) { unsigned int bytes = ::GlobalSize(hmemSelection); --- 1142,1218 ---- } + static UINT CodePageFromCharSet(DWORD characterSet, UINT documentCodePage) { + CHARSETINFO ci = { 0, 0, { { 0, 0, 0, 0 }, { 0, 0 } } }; + BOOL bci = ::TranslateCharsetInfo((DWORD*)characterSet, + &ci, TCI_SRCCHARSET); + + UINT cp; + if (bci) + cp = ci.ciACP; + else + cp = documentCodePage; + + CPINFO cpi; + if (!IsValidCodePage(cp) && !GetCPInfo(cp, &cpi)) + cp = CP_ACP; + + return cp; + } + void ScintillaWin::Paste() { ! if (!::OpenClipboard(MainHWND())) return; pdoc->BeginUndoAction(); ClearSelection(); + int selStart = SelectionStart(); bool isRectangular = ::IsClipboardFormatAvailable(cfColumnSelect) != 0; ! ! // Always use CF_UNICODETEXT if available ! HGLOBAL hmemUSelection = ::GetClipboardData(CF_UNICODETEXT); ! if (hmemUSelection) { ! wchar_t *uptr = static_cast<wchar_t *>(::GlobalLock(hmemUSelection)); ! if (uptr) { ! unsigned int len; ! char *putf; ! // Default Scintilla behaviour in Unicode mode ! if (IsUnicodeMode()) { unsigned int bytes = ::GlobalSize(hmemUSelection); ! len = UTF8Length(uptr, bytes / 2); ! putf = new char[len + 1]; if (putf) { ! UTF8FromUCS2(uptr, bytes / 2, putf, len); ! } ! } else { ! // CF_UNICODETEXT available, but not in Unicode mode ! // Convert from Unicode to current Scintilla code page ! UINT cpDest = CodePageFromCharSet( ! vs.styles[STYLE_DEFAULT].characterSet, pdoc->dbcsCodePage); ! len = ::WideCharToMultiByte(cpDest, 0, uptr, -1, ! NULL, 0, NULL, NULL) - 1; // subtract 0 terminator ! putf = new char[len + 1]; ! if (putf) { ! ::WideCharToMultiByte(cpDest, 0, uptr, -1, ! putf, len + 1, NULL, NULL); ! } ! } ! ! if (putf) { ! if (isRectangular) { ! PasteRectangular(selStart, putf, len); ! } else { ! if (pdoc->InsertString(currentPos, putf, len)) { ! SetEmptySelection(currentPos + len); } } + delete []putf; } } ! ::GlobalUnlock(hmemUSelection); ! } else { ! // CF_UNICODETEXT not available, paste ANSI text HGLOBAL hmemSelection = ::GetClipboardData(CF_TEXT); if (hmemSelection) { char *ptr = static_cast<char *>( ! ::GlobalLock(hmemSelection)); if (ptr) { unsigned int bytes = ::GlobalSize(hmemSelection); *************** *** 1178,1186 **** len = i; } ! if (isRectangular) { ! PasteRectangular(selStart, ptr, len); } else { ! pdoc->InsertString(currentPos, ptr, len); ! SetEmptySelection(currentPos + len); } } --- 1222,1257 ---- len = i; } ! ! // In Unicode mode, convert clipboard text to UTF-8 ! if (IsUnicodeMode()) { ! wchar_t *uptr = static_cast<wchar_t *>(::GlobalAlloc(GPTR, ! len * 2 + 2)); ! ! unsigned int ulen = ::MultiByteToWideChar(CP_ACP, 0, ! ptr, len, uptr, GlobalSize(static_cast<wchar_t *>(uptr))); ! ! unsigned int mlen = UTF8Length(uptr, ulen); ! char *putf = new char[mlen + 1]; ! if (putf) { ! // CP_UTF8 not available on Windows 95, so use UTF8FromUCS2() ! UTF8FromUCS2(uptr, ulen, putf, mlen); ! } ! ! ::GlobalFree(static_cast<wchar_t *>(uptr)); ! ! if (isRectangular) { ! PasteRectangular(selStart, putf, mlen); ! } else { ! pdoc->InsertString(currentPos, putf, mlen); ! SetEmptySelection(currentPos + mlen); ! } ! delete []putf; } else { ! if (isRectangular) { ! PasteRectangular(selStart, ptr, len); ! } else { ! pdoc->InsertString(currentPos, ptr, len); ! SetEmptySelection(currentPos + len); ! } } } *************** *** 1197,1201 **** #ifdef TOTAL_CONTROL if (!ct.wCallTip.Created()) { ! ct.wCallTip = ::CreateWindow(callClassName, "ACallTip", WS_POPUP, 100, 100, 150, 20, MainHWND(), 0, --- 1268,1272 ---- #ifdef TOTAL_CONTROL if (!ct.wCallTip.Created()) { ! ct.wCallTip = ::CreateWindow(callClassName, TEXT("ACallTip"), WS_POPUP, 100, 100, 150, 20, MainHWND(), 0, *************** *** 1398,1403 **** bool formatOK = (pFE->cfFormat == CF_TEXT) || ! ((pFE->cfFormat == CF_UNICODETEXT) && pd->sci->IsUnicodeMode()) || ! (pFE->cfFormat == CF_HDROP); if (!formatOK || pFE->ptd != 0 || --- 1469,1473 ---- bool formatOK = (pFE->cfFormat == CF_TEXT) || ! ((pFE->cfFormat == CF_UNICODETEXT) && pd->sci->IsUnicodeMode()); if (!formatOK || pFE->ptd != 0 || *************** *** 1551,1555 **** // The logfont for the IME is recreated here. int styleHere = (pdoc->StyleAt(currentPos)) & 31; ! LOGFONT lf = {0,0,0,0,0,0,0,0,0,0,0,0,0,""}; int sizeZoomed = vs.styles[styleHere].size + vs.zoomLevel; if (sizeZoomed <= 2) // Hangs if sizeZoomed <= 1 --- 1621,1625 ---- // The logfont for the IME is recreated here. int styleHere = (pdoc->StyleAt(currentPos)) & 31; ! LOGFONT lf = {0,0,0,0,0,0,0,0,0,0,0,0,0,TEXT("")}; int sizeZoomed = vs.styles[styleHere].size + vs.zoomLevel; if (sizeZoomed <= 2) // Hangs if sizeZoomed <= 1 *************** *** 1589,1602 **** char utfval[4]="\0\0\0"; char ansiChars[3]; - ansiChars[0] = b0; - ansiChars[1] = b1; - ansiChars[2] = '\0'; wchar_t wcs[2]; ! ::MultiByteToWideChar(inputCodePage, 0, ansiChars, 2, wcs, 1); unsigned int len = UTF8Length(wcs, 1); UTF8FromUCS2(wcs, 1, utfval, len); utfval[len] = '\0'; AddCharUTF(utfval,len); ! } else if (b1) { char dbcsChars[3]; dbcsChars[0] = b0; --- 1659,1678 ---- char utfval[4]="\0\0\0"; char ansiChars[3]; wchar_t wcs[2]; ! if (b0) { // Two bytes from IME ! ansiChars[0] = b0; ! ansiChars[1] = b1; ! ansiChars[2] = '\0'; ! ::MultiByteToWideChar(inputCodePage, 0, ansiChars, 2, wcs, 1); ! } else { ! ansiChars[0] = b1; ! ansiChars[1] = '\0'; ! ::MultiByteToWideChar(inputCodePage, 0, ansiChars, 1, wcs, 1); ! } unsigned int len = UTF8Length(wcs, 1); UTF8FromUCS2(wcs, 1, utfval, len); utfval[len] = '\0'; AddCharUTF(utfval,len); ! } else if (b0) { char dbcsChars[3]; dbcsChars[0] = b0; *************** *** 1605,1609 **** AddCharUTF(dbcsChars, 2, true); } else { ! AddChar(b0); } } --- 1681,1685 ---- AddCharUTF(dbcsChars, 2, true); } else { ! AddChar(b1); } } *************** *** 1616,1640 **** void ScintillaWin::CopyToClipboard(const SelectionText &selectedText) { if (!::OpenClipboard(MainHWND())) ! return; ::EmptyClipboard(); ! HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! selectedText.len); ! if (hand) { ! char *ptr = static_cast<char *>(::GlobalLock(hand)); ! memcpy(ptr, selectedText.s, selectedText.len); ! ::GlobalUnlock(hand); ! ::SetClipboardData(CF_TEXT, hand); ! } if (IsUnicodeMode()) { int uchars = UCS2Length(selectedText.s, selectedText.len); ! HGLOBAL uhand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! 2 * (uchars)); if (uhand) { ! wchar_t *uptr = static_cast<wchar_t *>(::GlobalLock(uhand)); UCS2FromUTF8(selectedText.s, selectedText.len, uptr, uchars); ! ::GlobalUnlock(uhand); ! ::SetClipboardData(CF_UNICODETEXT, uhand); } } --- 1692,1754 ---- void ScintillaWin::CopyToClipboard(const SelectionText &selectedText) { if (!::OpenClipboard(MainHWND())) ! return ; ::EmptyClipboard(); ! HGLOBAL uhand; ! wchar_t *uptr = 0; + // Default Scintilla behaviour in Unicode mode if (IsUnicodeMode()) { int uchars = UCS2Length(selectedText.s, selectedText.len); ! uhand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! 2 * (uchars)); if (uhand) { ! uptr = static_cast<wchar_t *>(::GlobalLock(uhand)); UCS2FromUTF8(selectedText.s, selectedText.len, uptr, uchars); ! } ! } else { ! // Not Unicode mode ! // Convert to Unicode using the current Scintilla code page ! UINT cpSrc = CodePageFromCharSet( ! selectedText.characterSet, selectedText.codePage); ! uhand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! 2 * (selectedText.len + 1)); ! if (uhand) { ! uptr = static_cast<wchar_t *>(::GlobalLock(uhand)); ! ::MultiByteToWideChar(cpSrc, 0, ! selectedText.s, selectedText.len, uptr, GlobalSize(uhand)); ! } ! } ! ! // Copy ANSI text to clipboard on Windows 9x ! // Convert from Unicode text, so other ANSI programs can ! // paste the text ! // Windows NT, 2k, XP automatically generates CF_TEXT ! if (!IsNT() && uhand) { ! HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! selectedText.len); ! if (hand) { ! char *ptr = static_cast<char *>(::GlobalLock(hand)); ! ::WideCharToMultiByte(CP_ACP, 0, uptr, -1, ptr, GlobalSize(hand), ! NULL, NULL); ! ::GlobalUnlock(hand); ! ::SetClipboardData(CF_TEXT, hand); ! } ! } ! ! if (uhand) { ! ::GlobalUnlock(uhand); ! ::SetClipboardData(CF_UNICODETEXT, uhand); ! } ! ! // There was a failure - try to copy at least ANSI text ! if (!uhand) { ! HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, ! selectedText.len); ! if (hand) { ! char *ptr = static_cast<char *>(::GlobalLock(hand)); ! memcpy(ptr, selectedText.s, selectedText.len); ! ::GlobalUnlock(hand); ! ::SetClipboardData(CF_TEXT, hand); } } *************** *** 1719,1722 **** --- 1833,1838 ---- RefreshStyleData(); HDC hdc = ::GetDC(MainHWND()); + // Select a stock font to prevent warnings from BoundsChecker + ::SelectObject(hdc, GetStockFont(DEFAULT_GUI_FONT)); AutoSurface surfaceWindow(hdc, this); if (surfaceWindow) { *************** *** 1734,1741 **** */ void ScintillaWin::FullPaint() { paintState = painting; rcPaint = GetClientRectangle(); paintingAllText = true; - HDC hdc = ::GetDC(MainHWND()); AutoSurface surfaceWindow(hdc, this); if (surfaceWindow) { --- 1850,1866 ---- */ void ScintillaWin::FullPaint() { + HDC hdc = ::GetDC(MainHWND()); + FullPaintDC(hdc); + ::ReleaseDC(MainHWND(), hdc); + } + + /** + * Redraw all of text area on the specified DC. + * This paint will not be abandoned. + */ + void ScintillaWin::FullPaintDC(HDC hdc) { paintState = painting; rcPaint = GetClientRectangle(); paintingAllText = true; AutoSurface surfaceWindow(hdc, this); if (surfaceWindow) { *************** *** 1743,1750 **** surfaceWindow->Release(); } - ::ReleaseDC(MainHWND(), hdc); paintState = notPainting; } /// Implement IUnknown STDMETHODIMP ScintillaWin::QueryInterface(REFIID riid, PVOID *ppv) { --- 1868,1890 ---- surfaceWindow->Release(); } paintState = notPainting; } + static bool CompareDevCap(HDC hdc, HDC hOtherDC, int nIndex) { + return ::GetDeviceCaps(hdc, nIndex) == ::GetDeviceCaps(hOtherDC, nIndex); + } + + bool ScintillaWin::IsCompatibleDC(HDC hOtherDC) { + HDC hdc = ::GetDC(MainHWND()); + bool isCompatible = + CompareDevCap(hdc, hOtherDC, TECHNOLOGY) && + CompareDevCap(hdc, hOtherDC, LOGPIXELSY) && + CompareDevCap(hdc, hOtherDC, LOGPIXELSX) && + CompareDevCap(hdc, hOtherDC, BITSPIXEL) && + CompareDevCap(hdc, hOtherDC, PLANES); + ::ReleaseDC(MainHWND(), hdc); + return isCompatible; + } + /// Implement IUnknown STDMETHODIMP ScintillaWin::QueryInterface(REFIID riid, PVOID *ppv) { *************** *** 1907,1912 **** STDMETHODIMP ScintillaWin::GetData(FORMATETC *pFEIn, STGMEDIUM *pSTM) { bool formatOK = (pFEIn->cfFormat == CF_TEXT) || ! ((pFEIn->cfFormat == CF_UNICODETEXT) && IsUnicodeMode()) || ! (pFEIn->cfFormat == CF_HDROP); if (!formatOK || pFEIn->ptd != 0 || --- 2047,2051 ---- STDMETHODIMP ScintillaWin::GetData(FORMATETC *pFEIn, STGMEDIUM *pSTM) { bool formatOK = (pFEIn->cfFormat == CF_TEXT) || ! ((pFEIn->cfFormat == CF_UNICODETEXT) && IsUnicodeMode()); if (!formatOK || pFEIn->ptd != 0 || *************** *** 1919,1927 **** } pSTM->tymed = TYMED_HGLOBAL; - if (pFEIn->cfFormat == CF_HDROP) { - pSTM->hGlobal = 0; - pSTM->pUnkForRelease = 0; - return S_OK; - } //Platform::DebugPrintf("DOB GetData OK %d %x %x\n", lenDrag, pFEIn, pSTM); --- 2058,2061 ---- *************** *** 2020,2023 **** --- 2154,2197 ---- } + bool ScintillaWin::HasCaretSizeChanged() { + if ( + ( (0 != vs.caretWidth) && (sysCaretWidth != vs.caretWidth) ) + || (0 != vs.lineHeight) && (sysCaretHeight != vs.lineHeight) + ) { + return true; + } + return false; + } + + BOOL ScintillaWin::CreateSystemCaret() { + sysCaretWidth = vs.caretWidth; + if (0 == sysCaretWidth) { + sysCaretWidth = 1; + } + sysCaretHeight = vs.lineHeight; + int bitmapSize = (((sysCaretWidth + 15) & ~15) >> 3) * + sysCaretHeight; + char *bits = new char[bitmapSize]; + memset(bits, 0, bitmapSize); + sysCaretBitmap = ::CreateBitmap(sysCaretWidth, sysCaretHeight, 1, + 1, reinterpret_cast<BYTE *>(bits)); + delete []bits; + BOOL retval = ::CreateCaret( + MainHWND(), sysCaretBitmap, + sysCaretWidth, sysCaretHeight); + ::ShowCaret(MainHWND()); + return retval; + } + + BOOL ScintillaWin::DestroySystemCaret() { + ::HideCaret(MainHWND()); + BOOL retval = ::DestroyCaret(); + if (sysCaretBitmap) { + ::DeleteObject(sysCaretBitmap); + sysCaretBitmap = 0; + } + return retval; + } + // Take care of 32/64 bit pointers #ifdef GetWindowLongPtr Index: deps.mak =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/deps.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** deps.mak 22 Dec 2004 20:26:00 -0000 1.1 --- deps.mak 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 1,137 **** - ExternalLexer.o: ExternalLexer.cxx ../include/Platform.h \ - ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \ - ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \ - ExternalLexer.h PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \ ! ../src/UniConversion.h ../src/XPM.h ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ ! ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ! ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ ! ../src/AutoComplete.h ../src/ViewStyle.h ../src/Document.h \ ! ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h CallTip.o: ../src/CallTip.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/CallTip.h CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \ ! ../src/ContractionState.h Document.o: ../src/Document.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \ ! ../src/Document.h ../src/RESearch.h DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../src/SVector.h \ ! ../include/Accessor.h ../src/DocumentAccessor.h ../src/CellBuffer.h \ ! ../include/Scintilla.h ../src/Document.h ! Editor.o: ../src/Editor.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/ContractionState.h ../src/SVector.h \ ! ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ ! ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ ! ../src/Document.h ../src/Editor.h Indicator.o: ../src/Indicator.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/Indicator.h ! KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/KeyMap.h KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexAda.o: ../src/LexAda.cxx ../include/Platform.h \ ! ../include/Accessor.h ../src/StyleContext.h ../include/PropSet.h \ ! ../include/SString.h ../include/KeyWords.h ../include/SciLexer.h LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexConf.o: ../src/LexConf.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCPP.o: ../src/LexCPP.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPascal.o: ../src/LexPascal.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ! ../src/StyleContext.h ! LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPython.o: ../src/LexPython.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h ! PropSet.o: ../src/PropSet.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h RESearch.o: ../src/RESearch.cxx ../src/RESearch.h ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ ! ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \ ! ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ ! ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ ! ../src/AutoComplete.h ../src/Document.h ../src/Editor.h \ ! ../src/ScintillaBase.h Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ! ../src/Style.h StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/Indicator.h ../src/XPM.h \ ! ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/WindowAccessor.h ../include/Scintilla.h XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h --- 1,210 ---- PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \ ! ../src/UniConversion.h ../src/XPM.h ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ ! ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ! ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ ! ../src/AutoComplete.h ../src/ViewStyle.h ../src/Document.h \ ! ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h CallTip.o: ../src/CallTip.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/CallTip.h CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \ ! ../src/ContractionState.h Document.o: ../src/Document.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \ ! ../src/Document.h ../src/RESearch.h DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../src/SVector.h \ ! ../include/Accessor.h ../src/DocumentAccessor.h ../src/CellBuffer.h \ ! ../include/Scintilla.h ../src/Document.h ! Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \ ! ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \ ! ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ ! ../src/Style.h ../src/ViewStyle.h ../src/Document.h ../src/Editor.h ! ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \ ! ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \ ! ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \ ! ../src/ExternalLexer.h Indicator.o: ../src/Indicator.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/Indicator.h ! KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ ! ../src/KeyMap.h KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/PropSet.h ../include/SString.h \ ! ../include/KeyWords.h ../include/SciLexer.h ! LexAPDL.o: ../src/LexAPDL.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexAU3.o: ../src/LexAU3.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexBash.o: ../src/LexBash.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexCLW.o: ../src/LexCLW.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexConf.o: ../src/LexConf.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h LexCPP.o: ../src/LexCPP.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexErlang.o: ../src/LexErlang.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexForth.o: ../src/LexForth.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexGui4Cli.o: ../src/LexGui4Cli.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexKix.o: ../src/LexKix.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ! LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexMetapost.o: ../src/LexMetapost.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ! ../src/StyleContext.h ! LexMMIXAL.o: ../src/LexMMIXAL.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexMPT.o: ../src/LexMPT.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ! LexMSSQL.o: ../src/LexMSSQL.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexNsis.o: ../src/LexNsis.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPascal.o: ../src/LexPascal.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ ! ../src/StyleContext.h ! LexPB.o: ../src/LexPB.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ! LexPOV.o: ../src/LexPOV.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexPS.o: ../src/LexPS.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPython.o: ../src/LexPython.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ! LexScriptol.o: ../src/LexScriptol.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexSpecman.o: ../src/LexSpecman.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ! LexTeX.o: ../src/LexTeX.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ! ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h ! LexVerilog.o: ../src/LexVerilog.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ! ../include/SciLexer.h ! LexYAML.o: ../src/LexYAML.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ! ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h ! PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ ! ../include/SString.h RESearch.o: ../src/RESearch.cxx ../src/RESearch.h ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ ! ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \ ! ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ ! ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ ! ../src/AutoComplete.h ../src/Document.h ../src/Editor.h \ ! ../src/ScintillaBase.h Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ! ../src/Style.h StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../src/StyleContext.h UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/Indicator.h ../src/XPM.h \ ! ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \ ! ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ! ../include/WindowAccessor.h ../include/Scintilla.h XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h Index: scintilla_vc6.mak =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/scintilla_vc6.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** scintilla_vc6.mak 22 Dec 2004 20:26:00 -0000 1.1 --- scintilla_vc6.mak 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 115,134 **** --- 115,140 ---- $(DIR_O)\LexAPDL.obj \ $(DIR_O)\LexAsm.obj \ + $(DIR_O)\LexAsn1.obj \ $(DIR_O)\LexAU3.obj \ $(DIR_O)\LexAVE.obj \ $(DIR_O)\LexBaan.obj \ $(DIR_O)\LexBash.obj \ + $(DIR_O)\LexBasic.obj \ $(DIR_O)\LexBullant.obj \ + $(DIR_O)\LexCaml.obj \ $(DIR_O)\LexCLW.obj \ $(DIR_O)\LexConf.obj \ $(DIR_O)\LexCPP.obj \ $(DIR_O)\LexCrontab.obj \ + $(DIR_O)\LexCsound.obj \ $(DIR_O)\LexCSS.obj \ $(DIR_O)\LexEiffel.obj \ $(DIR_O)\LexErlang.obj \ $(DIR_O)\LexEScript.obj \ + $(DIR_O)\LexFlagship.obj \ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ $(DIR_O)\LexGui4Cli.obj \ + $(DIR_O)\LexHaskell.obj \ $(DIR_O)\LexHTML.obj \ $(DIR_O)\LexKix.obj \ *************** *** 149,159 **** --- 155,169 ---- $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ + $(DIR_O)\LexRebol.obj \ $(DIR_O)\LexRuby.obj \ $(DIR_O)\LexScriptol.obj \ + $(DIR_O)\LexSmalltalk.obj \ $(DIR_O)\LexSpecman.obj \ $(DIR_O)\LexSQL.obj \ + $(DIR_O)\LexTADS3.obj \ $(DIR_O)\LexTeX.obj \ $(DIR_O)\LexVB.obj \ $(DIR_O)\LexVerilog.obj \ + $(DIR_O)\LexVHDL.obj \ $(DIR_O)\LexYAML.obj \ *************** *** 272,275 **** --- 282,287 ---- $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS) + $(DIR_O)\LexAsn1.obj: ..\src\LexAsn1.cxx $(LEX_HEADERS) + $(DIR_O)\LexAU3.obj: ..\src\LexAU3.cxx $(LEX_HEADERS) *************** *** 280,285 **** --- 292,301 ---- $(DIR_O)\LexBash.obj: ..\src\LexBash.cxx $(LEX_HEADERS) + $(DIR_O)\LexBasic.obj: ..\src\LexBasic.cxx $(LEX_HEADERS) + $(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS) + $(DIR_O)\LexCaml.obj: ..\src\LexCaml.cxx $(LEX_HEADERS) + $(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS) *************** *** 290,293 **** --- 306,311 ---- $(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS) + $(DIR_O)\LexCsound.obj: ..\src\LexCsound.cxx $(LEX_HEADERS) + $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS) *************** *** 298,301 **** --- 316,321 ---- $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) + $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS) + $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) *************** *** 304,307 **** --- 324,329 ---- $(DIR_O)\LexGui4Cli.obj: ..\src\LexGui4Cli.cxx $(LEX_HEADERS) + $(DIR_O)\LexHaskell.obj: ..\src\LexHaskell.cxx $(LEX_HEADERS) + $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS) *************** *** 340,351 **** --- 362,379 ---- $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) + $(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS) + $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS) + $(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS) + $(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS) $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) + $(DIR_O)\LexTADS3.obj: ..\src\LexTADS3.cxx $(LEX_HEADERS) + $(DIR_O)\LexTeX.obj: ..\src\LexTeX.cxx $(LEX_HEADERS) *************** *** 354,357 **** --- 382,387 ---- $(DIR_O)\LexVerilog.obj: ..\src\LexVerilog.cxx $(LEX_HEADERS) + $(DIR_O)\LexVHDL.obj: ..\src\LexVHDL.cxx $(LEX_HEADERS) + $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS) Index: ScintRes.rc =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/ScintRes.rc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ScintRes.rc 23 Jan 2005 16:38:02 -0000 1.2 --- ScintRes.rc 3 Sep 2005 10:13:13 -0000 1.3 *************** *** 32,37 **** VS_VERSION_INFO VERSIONINFO ! FILEVERSION 1,6,2,7 ! PRODUCTVERSION 1,6,2,5 FILEFLAGSMASK 0x3fL #ifdef _DEBUG --- 32,37 ---- VS_VERSION_INFO VERSIONINFO ! FILEVERSION 1,6,6,1 ! PRODUCTVERSION 1,6,6,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG *************** *** 51,62 **** VALUE "CompanyName", "Win32Forth developer team\0" VALUE "FileDescription", "Scintilla Source Editing Component\0" ! VALUE "FileVersion", "1, 6, 2, 7\0" VALUE "InternalName", "Scintilla\0" ! VALUE "LegalCopyright", "Copyright 1998-2004 by Neil Hodgson, 2004-2005 by Win32Forth developer team\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "w32fScintilla.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "Win32Forth\0" ! VALUE "ProductVersion", "1, 6, 2, 5\0" VALUE "SpecialBuild", "\0" END --- 51,62 ---- VALUE "CompanyName", "Win32Forth developer team\0" VALUE "FileDescription", "Scintilla Source Editing Component\0" ! VALUE "FileVersion", "1, 6, 6, 1\0" VALUE "InternalName", "Scintilla\0" ! VALUE "LegalCopyright", "Copyright 1998-2005 by Neil Hodgson, 2004-2005 by Win32Forth developer team\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "w32fScintilla.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "Win32Forth\0" ! VALUE "ProductVersion", "1, 6, 6, 1\0" VALUE "SpecialBuild", "\0" END Index: scintilla.mak =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/scintilla.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** scintilla.mak 22 Dec 2004 20:26:00 -0000 1.1 --- scintilla.mak 3 Sep 2005 10:13:13 -0000 1.2 *************** *** 53,57 **** LD=ilink32 ! CXXFLAGS=-P -tWM -w -w-prc -w-inl -RT- -x- # Above turns off warnings for clarfying parentheses and inlines with for not expanded CXXDEBUG=-Od -v -DDEBUG --- 53,57 ---- LD=ilink32 ! CXXFLAGS=-P -tWM -w -w-prc -w-inl -w-pin -RT- -x- # Above turns off warnings for clarfying parentheses and inlines with for not expanded CXXDEBUG=-Od -v -DDEBUG *************** *** 113,132 **** --- 113,138 ---- $(DIR_O)\LexAPDL.obj \ $(DIR_O)\LexAsm.obj \ + $(DIR_O)\LexAsn1.obj \ $(DIR_O)\LexAU3.obj \ $(DIR_O)\LexAVE.obj \ $(DIR_O)\LexBaan.obj \ $(DIR_O)\LexBash.obj \ + $(DIR_O)\LexBasic.obj \ $(DIR_O)\LexBullant.obj \ + $(DIR_O)\LexCaml.obj \ $(DIR_O)\LexCLW.obj \ $(DIR_O)\LexConf.obj \ $(DIR_O)\LexCPP.obj \ $(DIR_O)\LexCrontab.obj \ + $(DIR_O)\LexCsound.obj \ $(DIR_O)\LexCSS.obj \ $(DIR_O)\LexEiffel.obj \ $(DIR_O)\LexErlang.obj \ $(DIR_O)\LexEScript.obj \ + $(DIR_O)\LexFlagship.obj \ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ $(DIR_O)\LexGui4Cli.obj \ + $(DIR_O)\LexHaskell.obj \ $(DIR_O)\LexHTML.obj \ $(DIR_O)\LexKix.obj \ *************** *** 147,157 **** --- 153,167 ---- $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ + $(DIR_O)\LexRebol.obj \ $(DIR_O)\LexRuby.obj \ $(DIR_O)\LexScriptol.obj \ + $(DIR_O)\LexSmalltalk.obj \ $(DIR_O)\LexSpecman.obj \ $(DIR_O)\LexSQL.obj \ + $(DIR_O)\LexTADS3.obj \ $(DIR_O)\LexTeX.obj \ $(DIR_O)\LexVB.obj \ $(DIR_O)\LexVerilog.obj \ + $(DIR_O)\LexVHDL.obj \ $(DIR_O)\LexYAML.obj \ *************** *** 270,273 **** --- 280,285 ---- $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS) + $(DIR_O)\LexAsn1.obj: ..\src\LexAsn1.cxx $(LEX_HEADERS) + $(DIR_O)\LexAU3.obj: ..\src\LexAU3.cxx $(LEX_HEADERS) *************** *** 278,283 **** --- 290,299 ---- $(DIR_O)\LexBash.obj: ..\src\LexBash.cxx $(LEX_HEADERS) + $(DIR_O)\LexBasic.obj: ..\src\LexBasic.cxx $(LEX_HEADERS) + $(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS) + $(DIR_O)\LexCaml.obj: ..\src\LexCaml.cxx $(LEX_HEADERS) + $(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS) *************** *** 288,291 **** --- 304,309 ---- $(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS) + $(DIR_O)\LexCsound.obj: ..\src\LexCsound.cxx $(LEX_HEADERS) + $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS) *************** *** 296,299 **** --- 314,319 ---- $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) + $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS) + $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) *************** *** 302,305 **** --- 322,327 ---- $(DIR_O)\LexGui4Cli.obj: ..\src\LexGui4Cli.cxx $(LEX_HEADERS) + $(DIR_O)\LexHaskell.obj: ..\src\LexHaskell.cxx $(LEX_HEADERS) + $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS) *************** *** 338,349 **** --- 360,377 ---- $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) + $(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS) + $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS) + $(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS) + $(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS) $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) + $(DIR_O)\LexTADS3.obj: ..\src\LexTADS3.cxx $(LEX_HEADERS) + $(DIR_O)\LexTeX.obj: ..\src\LexTeX.cxx $(LEX_HEADERS) *************** *** 352,355 **** --- 380,385 ---- $(DIR_O)\LexVerilog.obj: ..\src\LexVerilog.cxx $(LEX_HEADERS) + $(DIR_O)\LexVHDL.obj: ..\src\LexVHDL.cxx $(LEX_HEADERS) + $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS) |
