From 68378c202880fc6715236d49329f63687677ef0d Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 28 Aug 2018 13:50:16 +0200 Subject: [PATCH] Cleanup of unused cursor code --- rtgui/cursormanager.cc | 7 ------- rtgui/cursormanager.h | 3 --- 2 files changed, 10 deletions(-) diff --git a/rtgui/cursormanager.cc b/rtgui/cursormanager.cc index 7db77a2d1..d0e57ba61 100644 --- a/rtgui/cursormanager.cc +++ b/rtgui/cursormanager.cc @@ -38,7 +38,6 @@ void CursorManager::init (Glib::RefPtr mainWindow) cResizeWidth = Gdk::Cursor::create (display, Gdk::SB_H_DOUBLE_ARROW); cResizeHeight = Gdk::Cursor::create (display, Gdk::SB_V_DOUBLE_ARROW); - //cResizeDiag = Gdk::Cursor::create (display, Gdk::BOTTOM_RIGHT_CORNER); cResizeTopLeft = Gdk::Cursor::create (display, Gdk::TOP_LEFT_CORNER); cResizeTopRight = Gdk::Cursor::create (display, Gdk::TOP_RIGHT_CORNER); cResizeBottomLeft = Gdk::Cursor::create (display, Gdk::BOTTOM_LEFT_CORNER); @@ -57,7 +56,6 @@ void CursorManager::init (Glib::RefPtr mainWindow) Glib::RefPtr cropDraw = RTImage::createFromFile ("crop-point-hicontrast.png"); Glib::RefPtr resizeWidth = RTImage::createFromFile ("node-move-x-hicontrast.png"); Glib::RefPtr resizeHeight = RTImage::createFromFile ("node-move-y-hicontrast.png"); - //Glib::RefPtr resizeDiag = RTImage::createFromFile ("node-move-diag-hicontrast.png"); Glib::RefPtr resizeTopLeft = RTImage::createFromFile ("node-move-nw-se-hicontrast.png"); Glib::RefPtr resizeTopRight = RTImage::createFromFile ("node-move-sw-ne-hicontrast.png"); Glib::RefPtr resizeBottomLeft = RTImage::createFromFile ("node-move-sw-ne-hicontrast.png"); @@ -66,8 +64,6 @@ void CursorManager::init (Glib::RefPtr mainWindow) Glib::RefPtr colPickAdd = RTImage::createFromFile ("color-picker-add-hicontrast.png"); Glib::RefPtr empty = RTImage::createFromFile ("empty.png"); Glib::RefPtr move2D = RTImage::createFromFile ("node-move-xy-hicontrast.png"); - //Glib::RefPtr move1DH = RTImage::createFromFile ("node-move-x-hicontrast.png"); - //Glib::RefPtr move1DV = RTImage::createFromFile ("node-move-y-hicontrast.png"); Glib::RefPtr rotate = RTImage::createFromFile ("rotate-aroundnode-hicontrast.png"); cCrosshair = crosshair ? Gdk::Cursor::create (cAdd->get_display(), crosshair, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::HAND2); @@ -84,8 +80,6 @@ void CursorManager::init (Glib::RefPtr mainWindow) cAddPicker = colPickAdd ? Gdk::Cursor::create (cAdd->get_display(), colPickAdd, 4, 21) : Gdk::Cursor::create (cAdd->get_display(), Gdk::ARROW); cHidden = empty ? Gdk::Cursor::create (cAdd->get_display(), empty, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::FLEUR); cMove2D = move2D ? Gdk::Cursor::create (cAdd->get_display(), move2D, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::FLEUR); - //cMove1DH = move1DH ? Gdk::Cursor::create (cAdd->get_display(), move1DH, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::FLEUR); - //cMove1DV = move1DV ? Gdk::Cursor::create (cAdd->get_display(), move1DV, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::FLEUR); cRotate = rotate ? Gdk::Cursor::create (cAdd->get_display(), rotate, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::CIRCLE); window = mainWindow; @@ -112,7 +106,6 @@ void CursorManager::setCursor (Glib::RefPtr window, CursorShape sha } else if (shape == CSResizeHeight) { window->set_cursor (cResizeHeight); } else if (shape == CSResizeDiagonal) { - //window->set_cursor (cResizeDiag); window->set_cursor (cMove2D); } else if (shape == CSResizeTopLeft) { window->set_cursor (cResizeTopLeft); diff --git a/rtgui/cursormanager.h b/rtgui/cursormanager.h index 2622aead2..e98202ae7 100644 --- a/rtgui/cursormanager.h +++ b/rtgui/cursormanager.h @@ -56,7 +56,6 @@ class CursorManager private: Glib::RefPtr cResizeWidth; Glib::RefPtr cResizeHeight; - //Glib::RefPtr cResizeDiag; Glib::RefPtr cResizeTopLeft; Glib::RefPtr cResizeTopRight; Glib::RefPtr cResizeBottomLeft; @@ -76,8 +75,6 @@ private: Glib::RefPtr cAddPicker; Glib::RefPtr cHidden; Glib::RefPtr cMove2D; - //Glib::RefPtr cMove1DH; - //Glib::RefPtr cMove1DV; Glib::RefPtr cRotate; Glib::RefPtr display;