Update of /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv12826/win32
Modified Files:
PlatWin.cxx ScintRes.rc ScintillaWin.cxx scintilla.mak
scintilla_vc6.mak
Removed Files:
ExternalLexer.h
Log Message:
New scintilla version.
Index: PlatWin.cxx
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/PlatWin.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PlatWin.cxx 2 Aug 2002 12:53:14 -0000 1.11
--- PlatWin.cxx 25 Nov 2003 10:45:21 -0000 1.12
***************
*** 3,7 ****
** Implementation of platform facilities on Windows.
**/
! // Copyright 1998-2002 by Neil Hodgson <ne...@sc...>
// The License.txt file describes the conditions under which this software may be distributed.
--- 3,7 ----
** Implementation of platform facilities on Windows.
**/
! // Copyright 1998-2003 by Neil Hodgson <ne...@sc...>
// The License.txt file describes the conditions under which this software may be distributed.
[...969 lines suppressed...]
+
// These are utility functions not really tied to a platform
***************
*** 1044,1052 ****
--- 1441,1454 ----
void Platform_Initialise(void *hInstance) {
+ OSVERSIONINFO osv = {sizeof(OSVERSIONINFO),0,0,0,0,""};
+ ::GetVersionEx(&osv);
+ onNT = osv.dwPlatformId == VER_PLATFORM_WIN32_NT;
::InitializeCriticalSection(&crPlatformLock);
hinstPlatformRes = reinterpret_cast<HINSTANCE>(hInstance);
+ ListBoxX_Register();
}
void Platform_Finalise() {
+ ListBoxX_Unregister();
::DeleteCriticalSection(&crPlatformLock);
}
Index: ScintRes.rc
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/ScintRes.rc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ScintRes.rc 2 Aug 2002 12:53:15 -0000 1.10
--- ScintRes.rc 25 Nov 2003 10:45:21 -0000 1.11
***************
*** 1,4 ****
// Resource file for Scintilla
! // Copyright 1998-2002 by Neil Hodgson <ne...@sc...>
// The License.txt file describes the conditions under which this software may be distributed.
--- 1,4 ----
// Resource file for Scintilla
! // Copyright 1998-2003 by Neil Hodgson <ne...@sc...>
// The License.txt file describes the conditions under which this software may be distributed.
***************
*** 10,15 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1, 4, 7, 0
! PRODUCTVERSION 1, 4, 7, 0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
--- 10,15 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1, 5, 6, 0
! PRODUCTVERSION 1, 5, 6, 0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
***************
*** 28,37 ****
VALUE "CompanyName", "Neil Hodgson ne...@sc...\0"
VALUE "FileDescription", "Scintilla.DLL - a Source Editing Component\0"
! VALUE "FileVersion", "1.47\0"
VALUE "InternalName", "Scintilla\0"
! VALUE "LegalCopyright", "Copyright 1998-2002 by Neil Hodgson\0"
VALUE "OriginalFilename", "Scintilla.DLL\0"
VALUE "ProductName", "Scintilla\0"
! VALUE "ProductVersion", "1.47\0"
END
END
--- 28,37 ----
VALUE "CompanyName", "Neil Hodgson ne...@sc...\0"
VALUE "FileDescription", "Scintilla.DLL - a Source Editing Component\0"
! VALUE "FileVersion", "1.56\0"
VALUE "InternalName", "Scintilla\0"
! VALUE "LegalCopyright", "Copyright 1998-2003 by Neil Hodgson\0"
VALUE "OriginalFilename", "Scintilla.DLL\0"
VALUE "ProductName", "Scintilla\0"
! VALUE "ProductVersion", "1.56\0"
END
END
Index: ScintillaWin.cxx
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/ScintillaWin.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ScintillaWin.cxx 2 Aug 2002 12:53:15 -0000 1.13
--- ScintillaWin.cxx 25 Nov 2003 10:45:21 -0000 1.14
***************
*** 3,7 ****
** Windows specific subclass of ScintillaBase.
**/
! // Copyright 1998-2002 by Neil Hodgson <ne...@sc...>
// The License.txt file describes the conditions under which this software may be distributed.
--- 3,7 ----
** Windows specific subclass of ScintillaBase.
**/
! // Copyright 1998-2003 by Neil Hodgson <ne...@sc...>
// The License.txt file describes the conditions under which this software may be distributed.
***************
*** 35,38 ****
--- 35,39 ----
#include "KeyMap.h"
#include "Indicator.h"
+ #include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
***************
*** 52,70 ****
#endif
! // These undefinitions are required to work around differences between different versions
! // of the mingw headers, some of which define these twice, in both winuser.h and imm.h.
! #ifdef __MINGW_H
! #undef WM_IME_STARTCOMPOSITION
! #undef WM_IME_ENDCOMPOSITION
! #undef WM_IME_COMPOSITION
! #undef WM_IME_KEYLAST
! #undef WM_IME_SETCONTEXT
! #undef WM_IME_NOTIFY
! #undef WM_IME_CONTROL
! #undef WM_IME_COMPOSITIONFULL
! #undef WM_IME_SELECT
! #undef WM_IME_CHAR
! #undef WM_IME_KEYDOWN
! #undef WM_IME_KEYUP
#endif
--- 53,62 ----
#endif
! #ifndef WM_UNICHAR
! #define WM_UNICHAR 0x0109
! #endif
!
! #ifndef UNICODE_NOCHAR
! #define UNICODE_NOCHAR 0xFFFF
#endif
***************
*** 85,88 ****
--- 77,87 ----
#endif
+ #define SC_WIN_IDLE 5001
+
+ // Functions imported from PlatWin
+ extern bool IsNT();
+ extern void Platform_Initialise(void *hInstance);
+ extern void Platform_Finalise();
+
/** TOTAL_CONTROL ifdef surrounds code that will only work when ScintillaWin
* is derived from ScintillaBase (all features) rather than directly from Editor
***************
*** 141,145 ****
class ScintillaWin :
public ScintillaBase {
!
bool lastKeyDownConsumed;
--- 140,144 ----
class ScintillaWin :
public ScintillaBase {
!
bool lastKeyDownConsumed;
***************
*** 175,182 ****
--- 174,184 ----
HWND hWnd, UINT iMessage, WPARAM wParam, sptr_t lParam);
+ enum { invalidTimerID, standardTimerID, idleTimerID };
+
virtual void StartDrag();
sptr_t WndPaint(uptr_t wParam);
sptr_t HandleComposition(uptr_t wParam, sptr_t lParam);
virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+ virtual bool SetIdle(bool on);
virtual void SetTicking(bool on);
virtual void SetMouseCapture(bool on);
***************
*** 205,209 ****
void GetIntelliMouseParameters();
! void CopySelTextToClipboard();
void ScrollMessage(WPARAM wParam);
void HorizontalScrollMessage(WPARAM wParam);
--- 207,211 ----
void GetIntelliMouseParameters();
! virtual void CopyToClipboard(const SelectionText &selectedText);
void ScrollMessage(WPARAM wParam);
void HorizontalScrollMessage(WPARAM wParam);
***************
*** 286,289 ****
--- 288,292 ----
ScintillaBase::Finalise();
SetTicking(false);
+ SetIdle(false);
::RevokeDragDrop(MainHWND());
::OleUninitialize();
***************
*** 335,338 ****
--- 338,349 ----
}
+ #ifndef VK_OEM_2
+ static const VK_OEM_2=0xbf;
+ static const VK_OEM_3=0xc0;
+ static const VK_OEM_4=0xdb;
+ static const VK_OEM_5=0xdc;
+ static const VK_OEM_6=0xdd;
+ #endif
+
/** Map the key codes to their equivalent SCK_ form. */
static int KeyTranslate(int keyIn) {
***************
*** 356,359 ****
--- 367,375 ----
case VK_SUBTRACT: return SCK_SUBTRACT;
case VK_DIVIDE: return SCK_DIVIDE;
+ case VK_OEM_2: return '/';
+ case VK_OEM_3: return '`';
+ case VK_OEM_4: return '[';
+ case VK_OEM_5: return '\\';
+ case VK_OEM_6: return ']';
default: return keyIn;
}
***************
*** 377,381 ****
::BeginPaint(MainHWND(), pps);
}
! AutoSurface surfaceWindow(pps->hdc, IsUnicodeMode());
if (surfaceWindow) {
rcPaint = PRectangle(pps->rcPaint.left, pps->rcPaint.top, pps->rcPaint.right, pps->rcPaint.bottom);
--- 393,397 ----
::BeginPaint(MainHWND(), pps);
}
! AutoSurface surfaceWindow(pps->hdc, this);
if (surfaceWindow) {
rcPaint = PRectangle(pps->rcPaint.left, pps->rcPaint.top, pps->rcPaint.right, pps->rcPaint.bottom);
***************
*** 405,414 ****
}
- static BOOL IsNT() {
- OSVERSIONINFO osv = {sizeof(OSVERSIONINFO),0,0,0,0,""};
- ::GetVersionEx(&osv);
- return osv.dwPlatformId == VER_PLATFORM_WIN32_NT;
- }
-
sptr_t ScintillaWin::HandleComposition(uptr_t wParam, sptr_t lParam) {
#ifdef __DMC__
--- 421,424 ----
***************
*** 482,485 ****
--- 492,496 ----
case WM_CUT: return SCI_CUT;
case WM_GETTEXT: return SCI_GETTEXT;
+ case WM_SETTEXT: return SCI_SETTEXT;
case WM_GETTEXTLENGTH: return SCI_GETTEXTLENGTH;
case WM_PASTE: return SCI_PASTE;
***************
*** 573,577 ****
case WM_TIMER:
! Tick();
break;
--- 584,618 ----
case WM_TIMER:
! if (wParam == standardTimerID && timer.ticking) {
! Tick();
! } else if (wParam == idleTimerID && idler.state) {
! SendMessage(MainHWND(), SC_WIN_IDLE, 0, 1);
! } else {
! return 1;
! }
! break;
!
! case SC_WIN_IDLE:
! // wParam=dwTickCountInitial, or 0 to initialize. lParam=bSkipUserInputTest
! if (idler.state) {
! if (lParam || (WAIT_TIMEOUT==MsgWaitForMultipleObjects(0,0,0,0, QS_INPUT|QS_HOTKEY))) {
! if (Idle()) {
! // User input was given priority above, but all events do get a turn. Other
! // messages, notifications, etc. will get interleaved with the idle messages.
!
! // However, some things like WM_PAINT are a lower priority, and will not fire
! // when there's a message posted. So, several times a second, we stop and let
! // the low priority events have a turn (after which the timer will fire again).
!
! DWORD dwCurrent = GetTickCount();
! DWORD dwStart = wParam ? wParam : dwCurrent;
!
! if (dwCurrent >= dwStart && dwCurrent > 200 && dwCurrent - 200 < dwStart)
! PostMessage(MainHWND(), SC_WIN_IDLE, dwStart, 0);
! } else {
! SetIdle(false);
! }
! }
! }
break;
***************
*** 585,590 ****
// Platform::IsKeyDown(VK_MENU));
ButtonDown(Point::FromLong(lParam), ::GetMessageTime(),
! (wParam & MK_SHIFT) != 0,
! (wParam & MK_CONTROL) != 0,
Platform::IsKeyDown(VK_MENU));
::SetFocus(MainHWND());
--- 626,631 ----
// Platform::IsKeyDown(VK_MENU));
ButtonDown(Point::FromLong(lParam), ::GetMessageTime(),
! (wParam & MK_SHIFT) != 0,
! (wParam & MK_CONTROL) != 0,
Platform::IsKeyDown(VK_MENU));
::SetFocus(MainHWND());
***************
*** 596,601 ****
case WM_LBUTTONUP:
! ButtonUp(Point::FromLong(lParam),
! ::GetMessageTime(),
(wParam & MK_CONTROL) != 0);
break;
--- 637,642 ----
case WM_LBUTTONUP:
! ButtonUp(Point::FromLong(lParam),
! ::GetMessageTime(),
(wParam & MK_CONTROL) != 0);
break;
***************
*** 614,617 ****
--- 655,660 ----
} else if (PointInSelection(Point(pt.x, pt.y))) {
DisplayCursor(Window::cursorArrow);
+ } else if (PointIsHotspot(Point(pt.x, pt.y))) {
+ DisplayCursor(Window::cursorHand);
} else {
DisplayCursor(Window::cursorText);
***************
*** 626,629 ****
--- 669,678 ----
if (!iscntrl(wParam&0xff) || !lastKeyDownConsumed) {
if (IsUnicodeMode()) {
+ // For a wide character version of the window:
+ //char utfval[4];
+ //wchar_t wcs[2] = {wParam, 0};
+ //unsigned int len = UTF8Length(wcs, 1);
+ //UTF8FromUCS2(wcs, 1, utfval, len);
+ //AddCharUTF(utfval, len);
AddCharBytes(static_cast<char>(wParam & 0xff));
} else {
***************
*** 633,636 ****
--- 682,703 ----
return 1;
+ case WM_UNICHAR:
+ if (wParam == UNICODE_NOCHAR) {
+ return 1;
+ } else if (lastKeyDownConsumed) {
+ return 1;
+ } else {
+ if (IsUnicodeMode()) {
+ char utfval[4];
+ wchar_t wcs[2] = {wParam, 0};
+ unsigned int len = UTF8Length(wcs, 1);
+ UTF8FromUCS2(wcs, 1, utfval, len);
+ AddCharUTF(utfval, len);
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+
case WM_SYSKEYDOWN:
case WM_KEYDOWN: {
***************
*** 665,670 ****
return DLGC_HASSETSEL | DLGC_WANTALLKEYS;
! case WM_KILLFOCUS:
! SetFocusState(false);
//RealizeWindowPalette(true);
break;
--- 732,744 ----
return DLGC_HASSETSEL | DLGC_WANTALLKEYS;
! 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);
! }
! }
//RealizeWindowPalette(true);
break;
***************
*** 704,708 ****
case WM_IME_CHAR: {
! AddCharBytes(HIBYTE(wParam), LOBYTE(wParam));
return 0;
}
--- 778,785 ----
case WM_IME_CHAR: {
! if (HIBYTE(wParam) == '\0')
! AddChar(LOBYTE(wParam));
! else
! AddCharBytes(HIBYTE(wParam), LOBYTE(wParam));
return 0;
}
***************
*** 741,744 ****
--- 818,822 ----
// These are not handled in Scintilla and its faster to dispatch them here.
// Also moves time out to here so profile doesn't count lots of empty message calls.
+
case WM_MOVE:
case WM_MOUSEACTIVATE:
***************
*** 826,829 ****
--- 904,913 ----
break;
+ #ifdef SCI_LEXER
+ case SCI_LOADLEXERLIBRARY:
+ LexerManager::GetInstance()->Load(reinterpret_cast<const char*>(lParam));
+ break;
+ #endif
+
default:
return ScintillaBase::WndProc(iMessage, wParam, lParam);
***************
*** 840,844 ****
timer.ticking = on;
if (timer.ticking) {
! timer.tickerID = reinterpret_cast<TickerID>(::SetTimer(MainHWND(), 1, timer.tickSize, NULL));
} else {
::KillTimer(MainHWND(), reinterpret_cast<uptr_t>(timer.tickerID));
--- 924,929 ----
timer.ticking = on;
if (timer.ticking) {
! timer.tickerID = ::SetTimer(MainHWND(), standardTimerID, timer.tickSize, NULL)
! ? reinterpret_cast<TickerID>(standardTimerID) : 0;
} else {
::KillTimer(MainHWND(), reinterpret_cast<uptr_t>(timer.tickerID));
***************
*** 849,852 ****
--- 934,954 ----
}
+ bool ScintillaWin::SetIdle(bool on) {
+ // On Win32 the Idler is implemented as a Timer on the Scintilla window. This
+ // takes advantage of the fact that WM_TIMER messages are very low priority,
+ // and are only posted when the message queue is empty, i.e. during idle time.
+ if (idler.state != on) {
+ if (on) {
+ idler.idlerID = ::SetTimer(MainHWND(), idleTimerID, 10, NULL)
+ ? reinterpret_cast<IdlerID>(idleTimerID) : 0;
+ } else {
+ ::KillTimer(MainHWND(), reinterpret_cast<uptr_t>(idler.idlerID));
+ idler.idlerID = 0;
+ }
+ idler.state = idler.idlerID != 0;
+ }
+ return idler.state;
+ }
+
void ScintillaWin::SetMouseCapture(bool on) {
if (mouseDownCaptures) {
***************
*** 901,906 ****
sci.fMask = SIF_PAGE | SIF_RANGE;
::GetScrollInfo(MainHWND(), SB_VERT, &sci);
! if ((sci.nMin != 0) ||
! (sci.nMax != nMax) ||
(sci.nPage != static_cast<unsigned int>(nPage)) ||
(sci.nPos != 0)) {
--- 1003,1011 ----
sci.fMask = SIF_PAGE | SIF_RANGE;
::GetScrollInfo(MainHWND(), SB_VERT, &sci);
! int vertEndPreferred = nMax;
! if (!verticalScrollBarVisible)
! vertEndPreferred = 0;
! if ((sci.nMin != 0) ||
! (sci.nMax != vertEndPreferred) ||
(sci.nPage != static_cast<unsigned int>(nPage)) ||
(sci.nPos != 0)) {
***************
*** 909,913 ****
sci.fMask = SIF_PAGE | SIF_RANGE;
sci.nMin = 0;
! sci.nMax = nMax;
sci.nPage = nPage;
sci.nPos = 0;
--- 1014,1018 ----
sci.fMask = SIF_PAGE | SIF_RANGE;
sci.nMin = 0;
! sci.nMax = vertEndPreferred;
sci.nPage = nPage;
sci.nPos = 0;
***************
*** 926,930 ****
sci.fMask = SIF_PAGE | SIF_RANGE;
::GetScrollInfo(MainHWND(), SB_HORZ, &sci);
! if ((sci.nMin != 0) ||
(sci.nMax != horizEndPreferred) ||
(sci.nPage != pageWidth) ||
--- 1031,1035 ----
sci.fMask = SIF_PAGE | SIF_RANGE;
::GetScrollInfo(MainHWND(), SB_HORZ, &sci);
! if ((sci.nMin != 0) ||
(sci.nMax != horizEndPreferred) ||
(sci.nPage != pageWidth) ||
***************
*** 981,991 ****
//Platform::DebugPrintf("Copy\n");
if (currentPos != anchor) {
! ::OpenClipboard(MainHWND());
! ::EmptyClipboard();
! CopySelTextToClipboard();
! if (selType == selRectangle) {
! ::SetClipboardData(cfColumnSelect, 0);
! }
! ::CloseClipboard();
}
}
--- 1086,1092 ----
//Platform::DebugPrintf("Copy\n");
if (currentPos != anchor) {
! SelectionText selectedText;
! CopySelectionRange(&selectedText);
! CopyToClipboard(selectedText);
}
}
***************
*** 1061,1070 ****
void ScintillaWin::CreateCallTipWindow(PRectangle) {
#ifdef TOTAL_CONTROL
! ct.wCallTip = ::CreateWindow(callClassName, "ACallTip",
! WS_VISIBLE | WS_CHILD, 100, 100, 150, 20,
! MainHWND(), reinterpret_cast<HMENU>(idCallTip),
! GetWindowInstance(MainHWND()),
! &ct);
! ct.wDraw = ct.wCallTip;
#endif
}
--- 1162,1173 ----
void ScintillaWin::CreateCallTipWindow(PRectangle) {
#ifdef TOTAL_CONTROL
! if (!ct.wCallTip.Created()) {
! ct.wCallTip = ::CreateWindow(callClassName, "ACallTip",
! WS_POPUP, 100, 100, 150, 20,
! MainHWND(), 0,
! GetWindowInstance(MainHWND()),
! this);
! ct.wDraw = ct.wCallTip;
! }
#endif
}
***************
*** 1174,1184 ****
static void *vtFormatEnumerator[] = {
! FormatEnumerator_QueryInterface,
! FormatEnumerator_AddRef,
! FormatEnumerator_Release,
! FormatEnumerator_Next,
! FormatEnumerator_Skip,
! FormatEnumerator_Reset,
! FormatEnumerator_Clone
};
--- 1277,1287 ----
static void *vtFormatEnumerator[] = {
! (void *)(FormatEnumerator_QueryInterface),
! (void *)(FormatEnumerator_AddRef),
! (void *)(FormatEnumerator_Release),
! (void *)(FormatEnumerator_Next),
! (void *)(FormatEnumerator_Skip),
! (void *)(FormatEnumerator_Reset),
! (void *)(FormatEnumerator_Clone)
};
***************
*** 1217,1225 ****
static void *vtDropSource[] = {
! DropSource_QueryInterface,
! DropSource_AddRef,
! DropSource_Release,
! DropSource_QueryContinueDrag,
! DropSource_GiveFeedback
};
--- 1320,1328 ----
static void *vtDropSource[] = {
! (void *)(DropSource_QueryInterface),
! (void *)(DropSource_AddRef),
! (void *)(DropSource_Release),
! (void *)(DropSource_QueryContinueDrag),
! (void *)(DropSource_GiveFeedback)
};
***************
*** 1329,1344 ****
static void *vtDataObject[] = {
! DataObject_QueryInterface,
! DataObject_AddRef,
! DataObject_Release,
! DataObject_GetData,
! DataObject_GetDataHere,
! DataObject_QueryGetData,
! DataObject_GetCanonicalFormatEtc,
! DataObject_SetData,
! DataObject_EnumFormatEtc,
! DataObject_DAdvise,
! DataObject_DUnadvise,
! DataObject_EnumDAdvise
};
--- 1432,1447 ----
static void *vtDataObject[] = {
! (void *)(DataObject_QueryInterface),
! (void *)(DataObject_AddRef),
! (void *)(DataObject_Release),
! (void *)(DataObject_GetData),
! (void *)(DataObject_GetDataHere),
! (void *)(DataObject_QueryGetData),
! (void *)(DataObject_GetCanonicalFormatEtc),
! (void *)(DataObject_SetData),
! (void *)(DataObject_EnumFormatEtc),
! (void *)(DataObject_DAdvise),
! (void *)(DataObject_DUnadvise),
! (void *)(DataObject_EnumDAdvise)
};
***************
*** 1377,1387 ****
static void *vtDropTarget[] = {
! DropTarget_QueryInterface,
! DropTarget_AddRef,
! DropTarget_Release,
! DropTarget_DragEnter,
! DropTarget_DragOver,
! DropTarget_DragLeave,
! DropTarget_Drop
};
--- 1480,1490 ----
static void *vtDropTarget[] = {
! (void *)(DropTarget_QueryInterface),
! (void *)(DropTarget_AddRef),
! (void *)(DropTarget_Release),
! (void *)(DropTarget_DragEnter),
! (void *)(DropTarget_DragOver),
! (void *)(DropTarget_DragLeave),
! (void *)(DropTarget_Drop)
};
***************
*** 1418,1422 ****
if (sizeZoomed <= 2) // Hangs if sizeZoomed <= 1
sizeZoomed = 2;
! AutoSurface surface(IsUnicodeMode());
int deviceHeight = sizeZoomed;
if (surface) {
--- 1521,1525 ----
if (sizeZoomed <= 2) // Hangs if sizeZoomed <= 1
sizeZoomed = 2;
! AutoSurface surface(this);
int deviceHeight = sizeZoomed;
if (surface) {
***************
*** 1477,1492 ****
}
! void ScintillaWin::CopySelTextToClipboard() {
! SelectionText selectedText;
! CopySelectionRange(&selectedText);
! if (selectedText.len == 0)
! return;
HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT,
! selectedText.len + 1);
if (hand) {
char *ptr = static_cast<char *>(::GlobalLock(hand));
memcpy(ptr, selectedText.s, selectedText.len);
- ptr[selectedText.len] = '\0';
::GlobalUnlock(hand);
}
--- 1580,1592 ----
}
! void ScintillaWin::CopyToClipboard(const SelectionText &selectedText) {
! ::OpenClipboard(MainHWND());
! ::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);
}
***************
*** 1496,1508 ****
int uchars = UCS2Length(selectedText.s, selectedText.len);
HGLOBAL uhand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT,
! 2 * (uchars + 1));
if (uhand) {
wchar_t *uptr = static_cast<wchar_t *>(::GlobalLock(uhand));
UCS2FromUTF8(selectedText.s, selectedText.len, uptr, uchars);
- uptr[uchars] = 0;
::GlobalUnlock(uhand);
}
::SetClipboardData(CF_UNICODETEXT, uhand);
}
}
--- 1596,1613 ----
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);
}
+
+ if (selectedText.rectangular) {
+ ::SetClipboardData(cfColumnSelect, 0);
+ }
+
+ ::CloseClipboard();
}
***************
*** 1579,1583 ****
RefreshStyleData();
HDC hdc = ::GetDC(MainHWND());
! AutoSurface surfaceWindow(hdc, IsUnicodeMode());
if (surfaceWindow) {
int changes = surfaceWindow->SetPalette(&palette, inBackGround);
--- 1684,1688 ----
RefreshStyleData();
HDC hdc = ::GetDC(MainHWND());
! AutoSurface surfaceWindow(hdc, this);
if (surfaceWindow) {
int changes = surfaceWindow->SetPalette(&palette, inBackGround);
***************
*** 1598,1602 ****
paintingAllText = true;
HDC hdc = ::GetDC(MainHWND());
! AutoSurface surfaceWindow(hdc, IsUnicodeMode());
if (surfaceWindow) {
Paint(surfaceWindow, rcPaint);
--- 1703,1707 ----
paintingAllText = true;
HDC hdc = ::GetDC(MainHWND());
! AutoSurface surfaceWindow(hdc, this);
if (surfaceWindow) {
Paint(surfaceWindow, rcPaint);
***************
*** 1789,1800 ****
if (pFEIn->cfFormat == CF_UNICODETEXT) {
int uchars = UCS2Length(drag.s, drag.len);
! hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, 2 * (uchars + 1));
if (hand) {
wchar_t *uptr = static_cast<wchar_t *>(::GlobalLock(hand));
UCS2FromUTF8(drag.s, drag.len, uptr, uchars);
- uptr[uchars] = 0;
}
} else {
! hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, drag.len + 1);
if (hand) {
char *ptr = static_cast<char *>(::GlobalLock(hand));
--- 1894,1904 ----
if (pFEIn->cfFormat == CF_UNICODETEXT) {
int uchars = UCS2Length(drag.s, drag.len);
! hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, 2 * (uchars));
if (hand) {
wchar_t *uptr = static_cast<wchar_t *>(::GlobalLock(hand));
UCS2FromUTF8(drag.s, drag.len, uptr, uchars);
}
} else {
! hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, drag.len);
if (hand) {
char *ptr = static_cast<char *>(::GlobalLock(hand));
***************
*** 1802,1806 ****
ptr[i] = drag.s[i];
}
- ptr[drag.len] = '\0';
}
}
--- 1906,1909 ----
***************
*** 1856,1860 ****
// Register the CallTip class
WNDCLASSEX wndclassc;
! wndclassc.cbSize = sizeof(wndclass);
wndclassc.style = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW;
wndclassc.cbClsExtra = 0;
--- 1959,1963 ----
// Register the CallTip class
WNDCLASSEX wndclassc;
! wndclassc.cbSize = sizeof(wndclassc);
wndclassc.style = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW;
wndclassc.cbClsExtra = 0;
***************
*** 1868,1872 ****
wndclassc.lpszClassName = callClassName;
wndclassc.hIconSm = 0;
!
result = ::RegisterClassEx(&wndclassc) != 0;
}
--- 1971,1975 ----
wndclassc.lpszClassName = callClassName;
wndclassc.hIconSm = 0;
!
result = ::RegisterClassEx(&wndclassc) != 0;
}
***************
*** 1903,1909 ****
// Find C++ object associated with window.
! CallTip *ctp = reinterpret_cast<CallTip *>(PointerFromWindow(hWnd));
// ctp will be zero if WM_CREATE not seen yet
! if (ctp == 0) {
if (iMessage == WM_CREATE) {
// Associate CallTip object with window
--- 2006,2012 ----
// Find C++ object associated with window.
! ScintillaWin *sciThis = reinterpret_cast<ScintillaWin *>(PointerFromWindow(hWnd));
// ctp will be zero if WM_CREATE not seen yet
! if (sciThis == 0) {
if (iMessage == WM_CREATE) {
// Associate CallTip object with window
***************
*** 1921,1931 ****
PAINTSTRUCT ps;
::BeginPaint(hWnd, &ps);
! AutoSurface surfaceWindow(ps.hdc, ctp->unicodeMode);
if (surfaceWindow) {
! ctp->PaintCT(surfaceWindow);
surfaceWindow->Release();
}
::EndPaint(hWnd, &ps);
return 0;
} else {
return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
--- 2024,2056 ----
PAINTSTRUCT ps;
::BeginPaint(hWnd, &ps);
! Surface *surfaceWindow = Surface::Allocate();
if (surfaceWindow) {
! surfaceWindow->Init(ps.hdc, hWnd);
! surfaceWindow->SetUnicodeMode(SC_CP_UTF8 == sciThis->ct.codePage);
! surfaceWindow->SetDBCSMode(sciThis->ct.codePage);
! sciThis->ct.PaintCT(surfaceWindow);
surfaceWindow->Release();
+ delete surfaceWindow;
}
::EndPaint(hWnd, &ps);
return 0;
+ } else if ((iMessage == WM_NCLBUTTONDOWN) || (iMessage == WM_NCLBUTTONDBLCLK)) {
+ POINT pt;
+ pt.x = static_cast<short>(LOWORD(lParam));
+ pt.y = static_cast<short>(HIWORD(lParam));
+ ScreenToClient(hWnd, &pt);
+ sciThis->ct.MouseClick(Point(pt.x, pt.y));
+ sciThis->CallTipClick();
+ return 0;
+ } else if (iMessage == WM_LBUTTONDOWN) {
+ // This does not fire due to the hit test code
+ sciThis->ct.MouseClick(Point::FromLong(lParam));
+ sciThis->CallTipClick();
+ return 0;
+ } else if (iMessage == WM_SETCURSOR) {
+ ::SetCursor(::LoadCursor(NULL,IDC_ARROW));
+ return 0;
+ } else if (iMessage == WM_NCHITTEST) {
+ return HTCAPTION;
} else {
return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
***************
*** 1972,1978 ****
}
- extern void Platform_Initialise(void *hInstance);
- extern void Platform_Finalise();
-
// This function is externally visible so it can be called from container when building statically.
// Must be called once only.
--- 2097,2100 ----
***************
*** 1982,1987 ****
#ifdef SCI_LEXER
Scintilla_LinkLexers();
- LexerManager *lexMan = LexerManager::GetInstance();
- lexMan->Load();
#endif
return result;
--- 2104,2107 ----
Index: scintilla.mak
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/scintilla.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** scintilla.mak 2 Aug 2002 12:53:15 -0000 1.5
--- scintilla.mak 25 Nov 2003 10:45:21 -0000 1.6
***************
*** 1,4 ****
# Make file for Scintilla on Windows Visual C++ and Borland C++ version
! # Copyright 1998-2002 by Neil Hodgson <ne...@sc...>
# The License.txt file describes the conditions under which this software may be distributed.
# This makefile is for using Visual C++ with nmake or Borland C++ with make depending on
--- 1,4 ----
# Make file for Scintilla on Windows Visual C++ and Borland C++ version
! # Copyright 1998-2003 by Neil Hodgson <ne...@sc...>
# The License.txt file describes the conditions under which this software may be distributed.
# This makefile is for using Visual C++ with nmake or Borland C++ with make depending on
***************
*** 84,88 ****
clean:
! -del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(COMPONENT) $(LEXCOMPONENT) $(DIR_O)\*.res $(DIR_BIN)\*.map
SOBJS=\
--- 84,89 ----
clean:
! -del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(COMPONENT) $(LEXCOMPONENT) \
! $(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb $(DIR_BIN)\*.lib
SOBJS=\
***************
*** 103,107 ****
$(DIR_O)\Style.obj \
$(DIR_O)\UniConversion.obj \
! $(DIR_O)\ViewStyle.obj
#++Autogenerated -- run src/LexGen.py to regenerate
--- 104,109 ----
$(DIR_O)\Style.obj \
$(DIR_O)\UniConversion.obj \
! $(DIR_O)\ViewStyle.obj \
! $(DIR_O)\XPM.obj
#++Autogenerated -- run src/LexGen.py to regenerate
***************
*** 109,130 ****
--- 111,150 ----
LEXOBJS=\
$(DIR_O)\LexAda.obj \
+ $(DIR_O)\LexAsm.obj \
$(DIR_O)\LexAVE.obj \
$(DIR_O)\LexBaan.obj \
$(DIR_O)\LexBullant.obj \
+ $(DIR_O)\LexCLW.obj \
$(DIR_O)\LexConf.obj \
$(DIR_O)\LexCPP.obj \
$(DIR_O)\LexCrontab.obj \
+ $(DIR_O)\LexCSS.obj \
$(DIR_O)\LexEiffel.obj \
+ $(DIR_O)\LexErlang.obj \
+ $(DIR_O)\LexEScript.obj \
+ $(DIR_O)\LexForth.obj \
+ $(DIR_O)\LexFortran.obj \
$(DIR_O)\LexHTML.obj \
$(DIR_O)\LexLisp.obj \
+ $(DIR_O)\LexLout.obj \
$(DIR_O)\LexLua.obj \
$(DIR_O)\LexMatlab.obj \
+ $(DIR_O)\LexMetapost.obj \
+ $(DIR_O)\LexMMIXAL.obj \
+ $(DIR_O)\LexMPT.obj \
+ $(DIR_O)\LexNsis.obj \
$(DIR_O)\LexOthers.obj \
$(DIR_O)\LexPascal.obj \
+ $(DIR_O)\LexPB.obj \
$(DIR_O)\LexPerl.obj \
+ $(DIR_O)\LexPOV.obj \
+ $(DIR_O)\LexPS.obj \
$(DIR_O)\LexPython.obj \
$(DIR_O)\LexRuby.obj \
+ $(DIR_O)\LexScriptol.obj \
$(DIR_O)\LexSQL.obj \
+ $(DIR_O)\LexTeX.obj \
$(DIR_O)\LexVB.obj \
+ $(DIR_O)\LexYAML.obj \
#--Autogenerated -- end of automatically generated section
***************
*** 152,155 ****
--- 172,176 ----
$(DIR_O)\UniConversion.obj \
$(DIR_O)\ViewStyle.obj \
+ $(DIR_O)\XPM.obj \
$(LEXOBJS)
***************
*** 219,227 ****
../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \
../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
! ../src/Document.h ../src/Editor.h
! $(DIR_O)\ExternalLexer.obj: 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
$(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \
../include/Scintilla.h ../src/Indicator.h
--- 240,248 ----
../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \
../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
! ../src/Document.h ../src/Editor.h ../src/XPM.h
! $(DIR_O)\ExternalLexer.obj: ../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
$(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \
../include/Scintilla.h ../src/Indicator.h
***************
*** 237,240 ****
--- 258,263 ----
$(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS)
***************
*** 243,246 ****
--- 266,271 ----
$(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS)
***************
*** 249,283 ****
$(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS)
$(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
$(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)
$(DIR_O)\LexLisp.obj: ..\src\LexLisp.cxx $(LEX_HEADERS)
$(DIR_O)\LexLua.obj: ..\src\LexLua.cxx $(LEX_HEADERS)
$(DIR_O)\LexMatlab.obj: ..\src\LexMatlab.cxx $(LEX_HEADERS)
$(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx $(LEX_HEADERS)
$(DIR_O)\LexPascal.obj: ..\src\LexPascal.cxx $(LEX_HEADERS)
$(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx $(LEX_HEADERS)
$(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS)
$(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS)
$(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS)
$(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS)
#--Autogenerated -- end of automatically generated section
$(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \
! ../include/Scintilla.h ../src/LineMarker.h
$(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h PlatformRes.h \
! ../src/UniConversion.h
$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h \
../include/PropSet.h ../include/SString.h
--- 274,340 ----
$(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexErlang.obj: ..\src\LexErlang.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)
$(DIR_O)\LexLisp.obj: ..\src\LexLisp.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexLout.obj: ..\src\LexLout.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexLua.obj: ..\src\LexLua.cxx $(LEX_HEADERS)
$(DIR_O)\LexMatlab.obj: ..\src\LexMatlab.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexMetapost.obj: ..\src\LexMetapost.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexMMIXAL.obj: ..\src\LexMMIXAL.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexMPT.obj: ..\src\LexMPT.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexNsis.obj: ..\src\LexNsis.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx $(LEX_HEADERS)
$(DIR_O)\LexPascal.obj: ..\src\LexPascal.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexPB.obj: ..\src\LexPB.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexPOV.obj: ..\src\LexPOV.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexPS.obj: ..\src\LexPS.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS)
$(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexTeX.obj: ..\src\LexTeX.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS)
+
#--Autogenerated -- end of automatically generated section
$(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \
! ../include/Scintilla.h ../src/LineMarker.h ../src/XPM.h
$(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h PlatformRes.h \
! ../src/UniConversion.h ../src/XPM.h
$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h \
../include/PropSet.h ../include/SString.h
***************
*** 289,298 ****
../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
../src/AutoComplete.h ../src/Document.h ../src/Editor.h \
! ../src/ScintillaBase.h
$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
! ..\src\ScintillaBase.h ..\include\PropSet.h \
! ..\include\SString.h ..\include\Accessor.h ..\src\DocumentAccessor.h ..\include\KeyWords.h
$(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \
../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
--- 346,355 ----
../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
../src/AutoComplete.h ../src/Document.h ../src/Editor.h \
! ../src/ScintillaBase.h ../src/XPM.h
$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
! ..\src\ScintillaBase.h ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
! ..\src\DocumentAccessor.h ..\include\KeyWords.h ../src/XPM.h
$(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \
../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
***************
*** 300,309 ****
../src/Indicator.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
$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
..\src\ScintillaBase.h ..\include\PropSet.h \
! ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h
$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
--- 357,366 ----
../src/Indicator.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 ../src/XPM.h
$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
..\src\ScintillaBase.h ..\include\PropSet.h \
! ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h ../src/XPM.h
$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
***************
*** 318,323 ****
$(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \
../include/Scintilla.h ../src/Indicator.h ../src/LineMarker.h \
! ../src/Style.h ../src/ViewStyle.h
$(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \
../include/PropSet.h ../include/SString.h ../include/Accessor.h \
../include/WindowAccessor.h ../include/Scintilla.h
--- 375,381 ----
$(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \
../include/Scintilla.h ../src/Indicator.h ../src/LineMarker.h \
! ../src/Style.h ../src/ViewStyle.h ../src/XPM.h
$(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \
../include/PropSet.h ../include/SString.h ../include/Accessor.h \
../include/WindowAccessor.h ../include/Scintilla.h
+ $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h
Index: scintilla_vc6.mak
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/scintilla_vc6.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scintilla_vc6.mak 2 Aug 2002 12:53:15 -0000 1.1
--- scintilla_vc6.mak 25 Nov 2003 10:45:21 -0000 1.2
***************
*** 86,90 ****
clean:
! -del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(COMPONENT) $(LEXCOMPONENT) $(DIR_O)\*.res $(DIR_BIN)\*.map
SOBJS=\
--- 86,91 ----
clean:
! -del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(COMPONENT) $(LEXCOMPONENT) \
! $(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb $(DIR_BIN)\*.lib
SOBJS=\
***************
*** 105,109 ****
$(DIR_O)\Style.obj \
$(DIR_O)\UniConversion.obj \
! $(DIR_O)\ViewStyle.obj
#++Autogenerated -- run src/LexGen.py to regenerate
--- 106,111 ----
$(DIR_O)\Style.obj \
$(DIR_O)\UniConversion.obj \
! $(DIR_O)\ViewStyle.obj \
! $(DIR_O)\XPM.obj
#++Autogenerated -- run src/LexGen.py to regenerate
***************
*** 111,132 ****
--- 113,152 ----
LEXOBJS=\
$(DIR_O)\LexAda.obj \
+ $(DIR_O)\LexAsm.obj \
$(DIR_O)\LexAVE.obj \
$(DIR_O)\LexBaan.obj \
$(DIR_O)\LexBullant.obj \
+ $(DIR_O)\LexCLW.obj \
$(DIR_O)\LexConf.obj \
$(DIR_O)\LexCPP.obj \
$(DIR_O)\LexCrontab.obj \
+ $(DIR_O)\LexCSS.obj \
$(DIR_O)\LexEiffel.obj \
+ $(DIR_O)\LexErlang.obj \
+ $(DIR_O)\LexEScript.obj \
+ $(DIR_O)\LexForth.obj \
+ $(DIR_O)\LexFortran.obj \
$(DIR_O)\LexHTML.obj \
$(DIR_O)\LexLisp.obj \
+ $(DIR_O)\LexLout.obj \
$(DIR_O)\LexLua.obj \
$(DIR_O)\LexMatlab.obj \
+ $(DIR_O)\LexMetapost.obj \
+ $(DIR_O)\LexMMIXAL.obj \
+ $(DIR_O)\LexMPT.obj \
+ $(DIR_O)\LexNsis.obj \
$(DIR_O)\LexOthers.obj \
$(DIR_O)\LexPascal.obj \
+ $(DIR_O)\LexPB.obj \
$(DIR_O)\LexPerl.obj \
+ $(DIR_O)\LexPOV.obj \
+ $(DIR_O)\LexPS.obj \
$(DIR_O)\LexPython.obj \
$(DIR_O)\LexRuby.obj \
+ $(DIR_O)\LexScriptol.obj \
$(DIR_O)\LexSQL.obj \
+ $(DIR_O)\LexTeX.obj \
$(DIR_O)\LexVB.obj \
+ $(DIR_O)\LexYAML.obj \
#--Autogenerated -- end of automatically generated section
***************
*** 154,157 ****
--- 174,178 ----
$(DIR_O)\UniConversion.obj \
$(DIR_O)\ViewStyle.obj \
+ $(DIR_O)\XPM.obj \
$(LEXOBJS)
***************
*** 221,229 ****
../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \
../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
! ../src/Document.h ../src/Editor.h
! $(DIR_O)\ExternalLexer.obj: 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
$(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \
../include/Scintilla.h ../src/Indicator.h
--- 242,250 ----
../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \
../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
! ../src/Document.h ../src/Editor.h ../src/XPM.h
! $(DIR_O)\ExternalLexer.obj: ../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
$(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \
../include/Scintilla.h ../src/Indicator.h
***************
*** 239,242 ****
--- 260,265 ----
$(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS)
***************
*** 245,248 ****
--- 268,273 ----
$(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS)
***************
*** 251,285 ****
$(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS)
$(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
$(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)
$(DIR_O)\LexLisp.obj: ..\src\LexLisp.cxx $(LEX_HEADERS)
$(DIR_O)\LexLua.obj: ..\src\LexLua.cxx $(LEX_HEADERS)
$(DIR_O)\LexMatlab.obj: ..\src\LexMatlab.cxx $(LEX_HEADERS)
$(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx $(LEX_HEADERS)
$(DIR_O)\LexPascal.obj: ..\src\LexPascal.cxx $(LEX_HEADERS)
$(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx $(LEX_HEADERS)
$(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS)
$(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS)
$(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS)
$(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS)
#--Autogenerated -- end of automatically generated section
$(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \
! ../include/Scintilla.h ../src/LineMarker.h
$(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h PlatformRes.h \
! ../src/UniConversion.h
$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h \
../include/PropSet.h ../include/SString.h
--- 276,342 ----
$(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexErlang.obj: ..\src\LexErlang.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS)
$(DIR_O)\LexLisp.obj: ..\src\LexLisp.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexLout.obj: ..\src\LexLout.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexLua.obj: ..\src\LexLua.cxx $(LEX_HEADERS)
$(DIR_O)\LexMatlab.obj: ..\src\LexMatlab.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexMetapost.obj: ..\src\LexMetapost.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexMMIXAL.obj: ..\src\LexMMIXAL.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexMPT.obj: ..\src\LexMPT.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexNsis.obj: ..\src\LexNsis.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx $(LEX_HEADERS)
$(DIR_O)\LexPascal.obj: ..\src\LexPascal.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexPB.obj: ..\src\LexPB.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexPOV.obj: ..\src\LexPOV.cxx $(LEX_HEADERS)
+
+ $(DIR_O)\LexPS.obj: ..\src\LexPS.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS)
$(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexTeX.obj: ..\src\LexTeX.cxx $(LEX_HEADERS)
+
$(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS)
+ $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS)
+
#--Autogenerated -- end of automatically generated section
$(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \
! ../include/Scintilla.h ../src/LineMarker.h ../src/XPM.h
$(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h PlatformRes.h \
! ../src/UniConversion.h ../src/XPM.h
$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h \
../include/PropSet.h ../include/SString.h
***************
*** 291,300 ****
../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
../src/AutoComplete.h ../src/Document.h ../src/Editor.h \
! ../src/ScintillaBase.h
$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
! ..\src\ScintillaBase.h ..\include\PropSet.h \
! ..\include\SString.h ..\include\Accessor.h ..\src\DocumentAccessor.h ..\include\KeyWords.h
$(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \
../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
--- 348,357 ----
../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
../src/AutoComplete.h ../src/Document.h ../src/Editor.h \
! ../src/ScintillaBase.h ../src/XPM.h
$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
! ..\src\ScintillaBase.h ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
! ..\src\DocumentAccessor.h ..\include\KeyWords.h ../src/XPM.h
$(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \
../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \
***************
*** 302,311 ****
../src/Indicator.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
$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
..\src\ScintillaBase.h ..\include\PropSet.h \
! ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h
$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
--- 359,368 ----
../src/Indicator.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 ../src/XPM.h
$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \
..\src\ScintillaBase.h ..\include\PropSet.h \
! ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h ../src/XPM.h
$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h \
..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
***************
*** 320,325 ****
$(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \
../include/Scintilla.h ../src/Indicator.h ../src/LineMarker.h \
! ../src/Style.h ../src/ViewStyle.h
$(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \
../include/PropSet.h ../include/SString.h ../include/Accessor.h \
! ../include/WindowAccessor.h ../include/Scintilla.h
\ No newline at end of file
--- 377,383 ----
$(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \
../include/Scintilla.h ../src/Indicator.h ../src/LineMarker.h \
! ../src/Style.h ../src/ViewStyle.h ../src/XPM.h
$(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \
../include/PropSet.h ../include/SString.h ../include/Accessor.h \
! ../include/WindowAccessor.h ../include/Scintilla.h
! $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h
--- ExternalLexer.h DELETED ---
|
