diff options
| -rw-r--r-- | win32/PlatWin.cxx | 2 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 6 | ||||
| -rw-r--r-- | win32/makefile_vc | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 7e91f42a2..f1c521521 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -824,7 +824,7 @@ int Platform::Maximum(int a, int b) { return b; } -#define TRACE +//#define TRACE #ifdef TRACE void Platform::DebugPrintf(const char *format, ...) { diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index b823ebd05..9a964161e 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1167,6 +1167,8 @@ void ScintillaWin::ScrollMessage(WPARAM wParam) { void ScintillaWin::HorizontalScrollMessage(WPARAM wParam) { int xPos = xOffset; + PRectangle rcText = GetTextRectangle(); + int pageWidth = rcText.Width() * 2 / 3; switch (LoWord(wParam)) { case SB_LINEUP: xPos -= 20; @@ -1175,10 +1177,10 @@ void ScintillaWin::HorizontalScrollMessage(WPARAM wParam) { xPos += 20; break; case SB_PAGEUP: - xPos -= 200; + xPos -= pageWidth; break; case SB_PAGEDOWN: - xPos += 200; + xPos += pageWidth; break; case SB_TOP: xPos = 0; diff --git a/win32/makefile_vc b/win32/makefile_vc index 374f499de..4f94c6bcd 100644 --- a/win32/makefile_vc +++ b/win32/makefile_vc @@ -54,7 +54,7 @@ LEXOBJS = $(DIR_O)\LexCPP.obj \ $(DIR_O)\LexVB.obj $(COMPONENT): $(SOBJS) $(DIR_O)\ScintRes.res - $(LD) /DLL /OUT:$@ $(SOBJS) $(DIR_O)\ScintRes.res $(LDFLAGS) + $(LD) /DLL /opt:nowin98 /OUT:$@ $(SOBJS) $(DIR_O)\ScintRes.res $(LDFLAGS) LOBJS = $(DIR_O)\ScintillaWinL.obj $(DIR_O)\ScintillaBaseL.obj \ $(DIR_O)\Editor.obj $(DIR_O)\Document.obj \ @@ -69,7 +69,7 @@ $(DIR_O)\ScintRes.res : ScintRes.rc $(RC) /fo$@ $(*B).rc $(LEXCOMPONENT): $(LOBJS) $(DIR_O)\ScintRes.res - $(LD) /DLL /OUT:$@ $(LOBJS) $(DIR_O)\ScintRes.res $(LDFLAGS) + $(LD) /DLL /opt:nowin98 /OUT:$@ $(LOBJS) $(DIR_O)\ScintRes.res $(LDFLAGS) $(DIR_O)\AutoComplete.obj: ..\src\AutoComplete.cxx ..\include\Platform.h ..\src\AutoComplete.h $(CC) $(INCLUDEDIRS) $(CXXFLAGS) /Fo$@ /c ..\src\$(@B).cxx |