diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/PlatWin.cxx | 18 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index cade8d005..00b5c59c5 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -2396,27 +2396,27 @@ HCURSOR LoadReverseArrowCursor(UINT dpi) noexcept { void Window::SetCursor(Cursor curs) { switch (curs) { - case cursorText: + case Cursor::text: ::SetCursor(::LoadCursor(NULL,IDC_IBEAM)); break; - case cursorUp: + case Cursor::up: ::SetCursor(::LoadCursor(NULL,IDC_UPARROW)); break; - case cursorWait: + case Cursor::wait: ::SetCursor(::LoadCursor(NULL,IDC_WAIT)); break; - case cursorHoriz: + case Cursor::horizontal: ::SetCursor(::LoadCursor(NULL,IDC_SIZEWE)); break; - case cursorVert: + case Cursor::vertical: ::SetCursor(::LoadCursor(NULL,IDC_SIZENS)); break; - case cursorHand: + case Cursor::hand: ::SetCursor(::LoadCursor(NULL,IDC_HAND)); break; - case cursorReverseArrow: - case cursorArrow: - case cursorInvalid: // Should not occur, but just in case. + case Cursor::reverseArrow: + case Cursor::arrow: + case Cursor::invalid: // Should not occur, but just in case. ::SetCursor(::LoadCursor(NULL,IDC_ARROW)); break; } diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index ddfa76b78..f6082b099 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -692,7 +692,7 @@ void ScintillaWin::DisplayCursor(Window::Cursor c) { if (cursorMode != SC_CURSORNORMAL) { c = static_cast<Window::Cursor>(cursorMode); } - if (c == Window::cursorReverseArrow) { + if (c == Window::Cursor::reverseArrow) { ::SetCursor(reverseArrowCursor.Load(dpi)); } else { wMain.SetCursor(c); @@ -1366,23 +1366,23 @@ sptr_t ScintillaWin::GetText(uptr_t wParam, sptr_t lParam) { Window::Cursor ScintillaWin::ContextCursor(Point pt) { if (inDragDrop == ddDragging) { - return Window::cursorUp; + return Window::Cursor::up; } else { // Display regular (drag) cursor over selection if (PointInSelMargin(pt)) { return GetMarginCursor(pt); } else if (!SelectionEmpty() && PointInSelection(pt)) { - return Window::cursorArrow; + return Window::Cursor::arrow; } else if (PointIsHotspot(pt)) { - return Window::cursorHand; + return Window::Cursor::hand; } else if (hoverIndicatorPos != Sci::invalidPosition) { const Sci::Position pos = PositionFromLocation(pt, true, true); if (pos != Sci::invalidPosition) { - return Window::cursorHand; + return Window::Cursor::hand; } } } - return Window::cursorText; + return Window::Cursor::text; } sptr_t ScintillaWin::ShowContextMenu(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { |