Copied/merged from the 2.2 branch.

Changes needed to build with new event system


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-02-16 08:40:24 +00:00
parent 1b62f00d8e
commit ce1ecc6d48
6 changed files with 150 additions and 108 deletions

View File

@@ -325,57 +325,41 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
void ScintillaWX::DoHScroll(int type, int pos) {
int xPos = xOffset;
switch (type) {
case wxEVT_SCROLLWIN_LINEUP:
if (type == wxEVT_SCROLLWIN_LINEUP)
xPos -= H_SCROLL_STEP;
break;
case wxEVT_SCROLLWIN_LINEDOWN:
else if (type == wxEVT_SCROLLWIN_LINEDOWN)
xPos += H_SCROLL_STEP;
break;
case wxEVT_SCROLLWIN_PAGEUP:
else if (type == wxEVT_SCROLLWIN_PAGEUP)
xPos -= H_SCROLL_PAGE;
break;
case wxEVT_SCROLLWIN_PAGEDOWN:
else if (type == wxEVT_SCROLLWIN_PAGEDOWN)
xPos += H_SCROLL_PAGE;
break;
case wxEVT_SCROLLWIN_TOP:
else if (type == wxEVT_SCROLLWIN_TOP)
xPos = 0;
break;
case wxEVT_SCROLLWIN_BOTTOM:
else if (type == wxEVT_SCROLLWIN_BOTTOM)
xPos = H_SCROLL_MAX;
break;
case wxEVT_SCROLLWIN_THUMBTRACK:
else if (type == wxEVT_SCROLLWIN_THUMBTRACK)
xPos = pos;
break;
}
HorizontalScrollTo(xPos);
}
void ScintillaWX::DoVScroll(int type, int pos) {
int topLineNew = topLine;
switch (type) {
case wxEVT_SCROLLWIN_LINEUP:
if (type == wxEVT_SCROLLWIN_LINEUP)
topLineNew -= 1;
break;
case wxEVT_SCROLLWIN_LINEDOWN:
else if (type == wxEVT_SCROLLWIN_LINEDOWN)
topLineNew += 1;
break;
case wxEVT_SCROLLWIN_PAGEUP:
else if (type == wxEVT_SCROLLWIN_PAGEUP)
topLineNew -= LinesToScroll();
break;
case wxEVT_SCROLLWIN_PAGEDOWN:
else if (type == wxEVT_SCROLLWIN_PAGEDOWN)
topLineNew += LinesToScroll();
break;
case wxEVT_SCROLLWIN_TOP:
else if (type == wxEVT_SCROLLWIN_TOP)
topLineNew = 0;
break;
case wxEVT_SCROLLWIN_BOTTOM:
else if (type == wxEVT_SCROLLWIN_BOTTOM)
topLineNew = MaxScrollPos();
break;
case wxEVT_SCROLLWIN_THUMBTRACK:
else if (type == wxEVT_SCROLLWIN_THUMBTRACK)
topLineNew = pos;
break;
}
ScrollTo(topLineNew);
}