Change Window::Cursor to an enum class.

9 files changed, 53 insertions, 53 deletions

diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index 66ddddb41..0c6a96ed1 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -1415,7 +1415,7 @@ void Window::SetCursor(Cursor curs) {
 		id idWin = (__bridge id)(wid);
 		if ([idWin isKindOfClass: [SCIContentView class]]) {
 			SCIContentView *container = idWin;
-			[container setCursor: curs];
+			[container setCursor: static_cast<int>(curs)];
 		}
 	}
 }
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index 81d8c7a71..2af97c278 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -39,19 +39,19 @@ NSString *const SCIUpdateUINotification = @"SCIUpdateUI";
  */
 static NSCursor *cursorFromEnum(Window::Cursor cursor) {
 	switch (cursor) {
-	case Window::cursorText:
+	case Window::Cursor::text:
 		return [NSCursor IBeamCursor];
-	case Window::cursorArrow:
+	case Window::Cursor::arrow:
 		return [NSCursor arrowCursor];
-	case Window::cursorWait:
+	case Window::Cursor::wait:
 		return waitCursor;
-	case Window::cursorHoriz:
+	case Window::Cursor::horizontal:
 		return [NSCursor resizeLeftRightCursor];
-	case Window::cursorVert:
+	case Window::Cursor::vertical:
 		return [NSCursor resizeUpDownCursor];
-	case Window::cursorReverseArrow:
+	case Window::Cursor::reverseArrow:
 		return reverseArrowCursor;
-	case Window::cursorUp:
+	case Window::Cursor::up:
 	default:
 		return [NSCursor arrowCursor];
 	}
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 9fe312121..95cc9e509 100755
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -1078,27 +1078,27 @@ void Window::SetCursor(Cursor curs) {
 
 	GdkCursor *gdkCurs;
 	switch (curs) {
-	case cursorText:
+	case Cursor::text:
 		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_XTERM);
 		break;
-	case cursorArrow:
+	case Cursor::arrow:
 		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_LEFT_PTR);
 		break;
-	case cursorUp:
+	case Cursor::up:
 		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_CENTER_PTR);
 		break;
-	case cursorWait:
+	case Cursor::wait:
 		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_WATCH);
 		break;
-	case cursorHand:
+	case Cursor::hand:
 		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_HAND2);
 		break;
-	case cursorReverseArrow:
+	case Cursor::reverseArrow:
 		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_RIGHT_PTR);
 		break;
 	default:
 		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_LEFT_PTR);
-		cursorLast = cursorArrow;
+		cursorLast = Cursor::arrow;
 		break;
 	}
 
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 5373f3ea6..5fd8bac89 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -347,9 +347,9 @@ void ScintillaGTK::MapThis() {
 		MapWidget(PWidget(wText));
 		MapWidget(PWidget(scrollbarh));
 		MapWidget(PWidget(scrollbarv));
-		wMain.SetCursor(Window::cursorArrow);
-		scrollbarv.SetCursor(Window::cursorArrow);
-		scrollbarh.SetCursor(Window::cursorArrow);
+		wMain.SetCursor(Window::Cursor::arrow);
+		scrollbarv.SetCursor(Window::Cursor::arrow);
+		scrollbarh.SetCursor(Window::Cursor::arrow);
 		ChangeSize();
 		gdk_window_show(PWindow(wMain));
 	} catch (...) {
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 9cd68a2df..2488d9687 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -716,14 +716,14 @@ void Window::SetCursor(Cursor curs)
 		Qt::CursorShape shape;
 
 		switch (curs) {
-			case cursorText:  shape = Qt::IBeamCursor;        break;
-			case cursorArrow: shape = Qt::ArrowCursor;        break;
-			case cursorUp:    shape = Qt::UpArrowCursor;      break;
-			case cursorWait:  shape = Qt::WaitCursor;         break;
-			case cursorHoriz: shape = Qt::SizeHorCursor;      break;
-			case cursorVert:  shape = Qt::SizeVerCursor;      break;
-			case cursorHand:  shape = Qt::PointingHandCursor; break;
-			default:          shape = Qt::ArrowCursor;        break;
+			case Cursor::text:  shape = Qt::IBeamCursor;        break;
+			case Cursor::arrow: shape = Qt::ArrowCursor;        break;
+			case Cursor::up:    shape = Qt::UpArrowCursor;      break;
+			case Cursor::wait:  shape = Qt::WaitCursor;         break;
+			case Cursor::horizontal: shape = Qt::SizeHorCursor; break;
+			case Cursor::vertical:  shape = Qt::SizeVerCursor;  break;
+			case Cursor::hand:  shape = Qt::PointingHandCursor; break;
+			default:            shape = Qt::ArrowCursor;        break;
 		}
 
 		QCursor cursor = QCursor(shape);
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 7fa790469..56164a312 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4300,7 +4300,7 @@ bool Editor::DragThreshold(Point ptStart, Point ptNow) {
 void Editor::StartDrag() {
 	// Always handled by subclasses
 	//SetMouseCapture(true);
-	//DisplayCursor(Window::cursorArrow);
+	//DisplayCursor(Windows::Cursor::Arrow);
 }
 
 void Editor::DropAt(SelectionPosition position, const char *value, size_t lengthValue, bool moving, bool rectangular) {
@@ -4428,7 +4428,7 @@ Window::Cursor Editor::GetMarginCursor(Point pt) const noexcept {
 			return static_cast<Window::Cursor>(m.cursor);
 		x += m.width;
 	}
-	return Window::cursorReverseArrow;
+	return Window::Cursor::reverseArrow;
 }
 
 void Editor::TrimAndSetSelection(Sci::Position currentPos_, Sci::Position anchor_) {
@@ -4868,7 +4868,7 @@ void Editor::ButtonMoveWithModifiers(Point pt, unsigned int, int modifiers) {
 
 		if (hotSpotClickPos != INVALID_POSITION && PositionFromLocation(pt, true, true) != hotSpotClickPos) {
 			if (inDragDrop == ddNone) {
-				DisplayCursor(Window::cursorText);
+				DisplayCursor(Window::Cursor::text);
 			}
 			hotSpotClickPos = INVALID_POSITION;
 		}
@@ -4884,18 +4884,18 @@ void Editor::ButtonMoveWithModifiers(Point pt, unsigned int, int modifiers) {
 		}
 		// Display regular (drag) cursor over selection
 		if (PointInSelection(pt) && !SelectionEmpty()) {
-			DisplayCursor(Window::cursorArrow);
+			DisplayCursor(Window::Cursor::arrow);
 			SetHoverIndicatorPosition(Sci::invalidPosition);
 		} else {
 			SetHoverIndicatorPoint(pt);
 			if (PointIsHotspot(pt)) {
-				DisplayCursor(Window::cursorHand);
+				DisplayCursor(Window::Cursor::hand);
 				SetHotSpotRange(&pt);
 			} else {
 				if (hoverIndicatorPos != Sci::invalidPosition)
-					DisplayCursor(Window::cursorHand);
+					DisplayCursor(Window::Cursor::hand);
 				else
-					DisplayCursor(Window::cursorText);
+					DisplayCursor(Window::Cursor::text);
 				SetHotSpotRange(nullptr);
 			}
 		}
@@ -4925,7 +4925,7 @@ void Editor::ButtonUpWithModifiers(Point pt, unsigned int curTime, int modifiers
 		if (PointInSelMargin(pt)) {
 			DisplayCursor(GetMarginCursor(pt));
 		} else {
-			DisplayCursor(Window::cursorText);
+			DisplayCursor(Window::Cursor::text);
 			SetHotSpotRange(nullptr);
 		}
 		ptMouseLast = pt;
@@ -7891,7 +7891,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 
 	case SCI_SETCURSOR:
 		cursorMode = static_cast<int>(wParam);
-		DisplayCursor(Window::cursorText);
+		DisplayCursor(Window::Cursor::text);
 		break;
 
 	case SCI_GETCURSOR:
diff --git a/src/Platform.h b/src/Platform.h
index 5b2116fcd..c0a13d911 100644
--- a/src/Platform.h
+++ b/src/Platform.h
@@ -223,13 +223,13 @@ class Window {
 protected:
 	WindowID wid;
 public:
-	Window() noexcept : wid(nullptr), cursorLast(cursorInvalid) {
+	Window() noexcept : wid(nullptr), cursorLast(Cursor::invalid) {
 	}
 	Window(const Window &source) = delete;
 	Window(Window &&) = delete;
 	Window &operator=(WindowID wid_) noexcept {
 		wid = wid_;
-		cursorLast = cursorInvalid;
+		cursorLast = Cursor::invalid;
 		return *this;
 	}
 	Window &operator=(const Window &) = delete;
@@ -245,7 +245,7 @@ public:
 	void Show(bool show=true);
 	void InvalidateAll();
 	void InvalidateRectangle(PRectangle rc);
-	enum Cursor { cursorInvalid, cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow, cursorHand };
+	enum class Cursor { invalid, text, arrow, up, wait, horizontal, vertical, reverseArrow, hand };
 	void SetCursor(Cursor curs);
 	PRectangle GetMonitorRect(Point pt);
 private:
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) {