From 1b7ddf2b31eb35660b9aac853db22bf4add1d1a2 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
Date: Fri, 14 May 2021 22:20:25 -0700
Subject: [PATCH] Fix perspective and local adjustments cursor icons

Correctly override the getCursor virtual function.
---
 rtgui/controllines.cc     | 2 +-
 rtgui/controllines.h      | 2 +-
 rtgui/controlspotpanel.cc | 2 +-
 rtgui/controlspotpanel.h  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rtgui/controllines.cc b/rtgui/controllines.cc
index 573b3263f..c078b4322 100644
--- a/rtgui/controllines.cc
+++ b/rtgui/controllines.cc
@@ -268,7 +268,7 @@ bool ControlLineManager::getEdited(void) const
     return edited;
 }
 
-CursorShape ControlLineManager::getCursor(int objectID) const
+CursorShape ControlLineManager::getCursor(int objectID, int xPos, int yPos) const
 {
     return cursor;
 }
diff --git a/rtgui/controllines.h b/rtgui/controllines.h
index c623ee1db..2b2d179a4 100644
--- a/rtgui/controllines.h
+++ b/rtgui/controllines.h
@@ -109,7 +109,7 @@ public:
     bool pick1(bool picked) override;
     bool pick3(bool picked) override;
     bool drag1(int modifierKey) override;
-    CursorShape getCursor(int objectID) const;
+    CursorShape getCursor(int objectID, int xPos, int yPos) const override;
     bool mouseOver(int modifierKey) override;
     void switchOffEditMode(void) override;
 };
diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc
index 5450ba3ed..6289ed1ae 100644
--- a/rtgui/controlspotpanel.cc
+++ b/rtgui/controlspotpanel.cc
@@ -2196,7 +2196,7 @@ void ControlSpotPanel::updateCurveOpacity(const Gtk::TreeModel::Row& selectedRow
     }
 }
 
-CursorShape ControlSpotPanel::getCursor(int objectID) const
+CursorShape ControlSpotPanel::getCursor(int objectID, int xPos, int yPos) const
 {
     // printf("Object ID: %d\n", objectID);
 
diff --git a/rtgui/controlspotpanel.h b/rtgui/controlspotpanel.h
index bebc24bee..b748df544 100644
--- a/rtgui/controlspotpanel.h
+++ b/rtgui/controlspotpanel.h
@@ -267,7 +267,7 @@ private:
     void updateControlSpotCurve(const Gtk::TreeModel::Row& row);
     void deleteControlSpotCurve(Gtk::TreeModel::Row& row);
     void updateCurveOpacity(const Gtk::TreeModel::Row& selectedRow);
-    CursorShape getCursor(int objectID) const;
+    CursorShape getCursor(int objectID, int xPos, int yPos) const override;
     bool mouseOver(int modifierKey) override;
     bool button1Pressed(int modifierKey) override;
     bool button1Released() override;