diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/ScintillaWin.cxx | 5 | ||||
| -rw-r--r-- | win32/makefile_bor | 89 | ||||
| -rw-r--r-- | win32/makefile_vc | 98 |
3 files changed, 3 insertions, 189 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index b7b10a261..3ac668240 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -264,6 +264,7 @@ static int InputCodePage() { // Map the key codes to their equivalent SCK_ form static int KeyTranslate(int keyIn) { +assert(!keyIn); switch (keyIn) { case VK_DOWN: return SCK_DOWN; case VK_UP: return SCK_UP; @@ -296,8 +297,8 @@ LRESULT ScintillaWin::WndPaint(unsigned long wParam) { paintState = painting; PAINTSTRUCT ps; PAINTSTRUCT* pps; -//assert(wParam); - bool IsOcxCtrl = (wParam != 0); // if wParam != 0, it contains + + bool IsOcxCtrl = (wParam != 0); // if wParam != 0, it contains // a PAINSTRUCT* from the OCX if(IsOcxCtrl) pps = reinterpret_cast<PAINTSTRUCT*>(wParam); diff --git a/win32/makefile_bor b/win32/makefile_bor deleted file mode 100644 index d2c4f86aa..000000000 --- a/win32/makefile_bor +++ /dev/null @@ -1,89 +0,0 @@ -# Make file for Scintilla on Windows Borland C++ Builder version -# Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org> -# The License.txt file describes the conditions under which this software may be distributed. -# This makefile is for using Borland C++ and Borland make. -# I test with Borland C++ 5.5 -# The main makefile uses mingw32 gcc and may be more current than this file. - -.SUFFIXES: .cxx -CC = bcc32 -RC = brcc32 -LD = ilink32 - -DIR_O=. -DIR_BIN=..\bin - -COMPONENT=$(DIR_BIN)\Scintilla.dll -LEXCOMPONENT=$(DIR_BIN)\SciLexer.dll - -LDFLAGS = import32 cw32mt -INCLUDEDIRS=-I../include -I../src -CXXFLAGS = -P -O1 -tWM -w -w-prc -RT- -x- -v -NAMEFLAG=-o - -.cxx.obj: - $(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $*.cxx - -.rc.res: - $(RC) /r $*.rc - -ALL: $(COMPONENT) $(LEXCOMPONENT) $(DIR_O)\ScintillaWinS.obj $(DIR_O)\WindowAccessor.obj - -clean: - del /q *.exe *.o *.obj *.dll *.res *.map - -SOBJS=\ - $(DIR_O)\AutoComplete.obj \ - $(DIR_O)\CallTip.obj \ - $(DIR_O)\CellBuffer.obj \ - $(DIR_O)\ContractionState.obj \ - $(DIR_O)\Document.obj \ - $(DIR_O)\Editor.obj \ - $(DIR_O)\Indicator.obj \ - $(DIR_O)\KeyMap.obj \ - $(DIR_O)\LineMarker.obj \ - $(DIR_O)\PlatWin.obj \ - $(DIR_O)\ScintillaBase.obj \ - $(DIR_O)\ScintillaWin.obj \ - $(DIR_O)\Style.obj \ - $(DIR_O)\UniConversion.obj \ - $(DIR_O)\ViewStyle.obj - -LEXOBJS=\ - $(DIR_O)\LexCPP.obj \ - $(DIR_O)\LexHTML.obj \ - $(DIR_O)\LexLua.obj \ - $(DIR_O)\LexOthers.obj \ - $(DIR_O)\LexPerl.obj \ - $(DIR_O)\LexPython.obj \ - $(DIR_O)\LexSQL.obj \ - $(DIR_O)\LexVB.obj - -LOBJS=\ - $(DIR_O)\AutoComplete.obj \ - $(DIR_O)\CallTip.obj \ - $(DIR_O)\CellBuffer.obj \ - $(DIR_O)\ContractionState.obj \ - $(DIR_O)\Document.obj \ - $(DIR_O)\DocumentAccessor.obj \ - $(DIR_O)\Editor.obj \ - $(DIR_O)\Indicator.obj \ - $(DIR_O)\KeyMap.obj \ - $(DIR_O)\KeyWords.obj \ - $(DIR_O)\LineMarker.obj \ - $(DIR_O)\PlatWin.obj \ - $(DIR_O)\PropSet.obj \ - $(DIR_O)\ScintillaBaseL.obj \ - $(DIR_O)\ScintillaWinL.obj \ - $(DIR_O)\Style.obj \ - $(DIR_O)\UniConversion.obj \ - $(DIR_O)\ViewStyle.obj \ - $(LEXOBJS) - -$(COMPONENT): $(SOBJS) ScintRes.res - $(LD) -Tpd /c c0d32 $(SOBJS), $@, ,$(LDFLAGS), , ScintRes.res - -$(LEXCOMPONENT): $(LOBJS) - $(LD) -Tpd /c c0d32 $(LOBJS), $@, ,$(LDFLAGS), , ScintRes.res - -!include objs.mak diff --git a/win32/makefile_vc b/win32/makefile_vc deleted file mode 100644 index 58d2a7ab8..000000000 --- a/win32/makefile_vc +++ /dev/null @@ -1,98 +0,0 @@ -# Make file for Scintilla on Windows Visual C++ version -# Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org> -# The License.txt file describes the conditions under which this software may be distributed. -# This makefile is for using Visual C++ and nmake. -# The main makefile uses mingw32 gcc and may be more current than this file. - -.SUFFIXES: .cxx -CC = cl -RC = rc -LD = link - -DIR_O=. -DIR_BIN=..\bin - -COMPONENT=$(DIR_BIN)\Scintilla.dll -LEXCOMPONENT=$(DIR_BIN)\SciLexer.dll - -LDFLAGS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB -INCLUDEDIRS=-I ../include -I ../src -CXXFLAGS = /TP /W4 -NAMEFLAG=-Fo - -!IFDEF DEBUG -CXXFLAGS=$(CXXFLAGS) /Zi /Od /MDd -LDFLAGS=/DEBUG $(LDFLAGS) -!ELSE -CXXFLAGS=$(CXXFLAGS) /Ox /MD -!ENDIF - -#.cxx.obj: -# $(CC) $(INCLUDEDIRS) $(CXXFLAGS) -c $< /Fo$@ - -.rc.res: - $(RC) $*.rc - -ALL: $(COMPONENT) $(LEXCOMPONENT) $(DIR_O)\ScintillaWinS.obj $(DIR_O)\WindowAccessor.obj - -clean: - del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(COMPONENT) $(LEXCOMPONENT) $(DIR_O)\*.res $(DIR_BIN)\*.map - -SOBJS=\ - $(DIR_O)\AutoComplete.obj \ - $(DIR_O)\CallTip.obj \ - $(DIR_O)\CellBuffer.obj \ - $(DIR_O)\ContractionState.obj \ - $(DIR_O)\Document.obj \ - $(DIR_O)\Editor.obj \ - $(DIR_O)\Indicator.obj \ - $(DIR_O)\KeyMap.obj \ - $(DIR_O)\LineMarker.obj \ - $(DIR_O)\PlatWin.obj \ - $(DIR_O)\ScintillaBase.obj \ - $(DIR_O)\ScintillaWin.obj \ - $(DIR_O)\Style.obj \ - $(DIR_O)\UniConversion.obj \ - $(DIR_O)\ViewStyle.obj - -LEXOBJS=\ - $(DIR_O)\LexCPP.obj \ - $(DIR_O)\LexHTML.obj \ - $(DIR_O)\LexLua.obj \ - $(DIR_O)\LexOthers.obj \ - $(DIR_O)\LexPerl.obj \ - $(DIR_O)\LexPython.obj \ - $(DIR_O)\LexSQL.obj \ - $(DIR_O)\LexVB.obj - -LOBJS=\ - $(DIR_O)\AutoComplete.obj \ - $(DIR_O)\CallTip.obj \ - $(DIR_O)\CellBuffer.obj \ - $(DIR_O)\ContractionState.obj \ - $(DIR_O)\Document.obj \ - $(DIR_O)\DocumentAccessor.obj \ - $(DIR_O)\Editor.obj \ - $(DIR_O)\Indicator.obj \ - $(DIR_O)\KeyMap.obj \ - $(DIR_O)\KeyWords.obj \ - $(DIR_O)\LineMarker.obj \ - $(DIR_O)\PlatWin.obj \ - $(DIR_O)\PropSet.obj \ - $(DIR_O)\ScintillaBaseL.obj \ - $(DIR_O)\ScintillaWinL.obj \ - $(DIR_O)\Style.obj \ - $(DIR_O)\UniConversion.obj \ - $(DIR_O)\ViewStyle.obj \ - $(LEXOBJS) - -$(COMPONENT): $(SOBJS) $(DIR_O)\ScintRes.res - $(LD) /DLL /opt:nowin98 /OUT:$@ $(SOBJS) $(DIR_O)\ScintRes.res $(LDFLAGS) - -$(DIR_O)\ScintRes.res : ScintRes.rc - $(RC) /fo$@ $(*B).rc - -$(LEXCOMPONENT): $(LOBJS) $(DIR_O)\ScintRes.res - $(LD) /DLL /opt:nowin98 /OUT:$@ $(LOBJS) $(DIR_O)\ScintRes.res $(LDFLAGS) - -!include objs.mak |