From 865c072d431de49a53b3078d77ffc13b9c1b133d Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Sat, 4 Feb 2017 20:28:16 -0500
Subject: [PATCH] #if STUPID set custom cursor #endif

---
 ShiftOS.WinForms/Tools/ControlManager.cs | 2 ++
 ShiftOS_TheReturn/Skinning.cs            | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ShiftOS.WinForms/Tools/ControlManager.cs b/ShiftOS.WinForms/Tools/ControlManager.cs
index 5778dd5..c5b073f 100644
--- a/ShiftOS.WinForms/Tools/ControlManager.cs
+++ b/ShiftOS.WinForms/Tools/ControlManager.cs
@@ -137,6 +137,7 @@ namespace ShiftOS.WinForms.Tools
 
         public static void SetCursor(Control ctrl)
         {
+#if STUPID
             if (!(ctrl is WebBrowser))
             {
                 var mouse = SkinEngine.GetImage("mouse");
@@ -151,6 +152,7 @@ namespace ShiftOS.WinForms.Tools
                 var cursor = new Cursor(handle);
                 ctrl.Cursor = cursor;
             }
+#endif
         }
 
         public static void SetupControl(Control ctrl)
diff --git a/ShiftOS_TheReturn/Skinning.cs b/ShiftOS_TheReturn/Skinning.cs
index d6af165..3b618c1 100644
--- a/ShiftOS_TheReturn/Skinning.cs
+++ b/ShiftOS_TheReturn/Skinning.cs
@@ -153,14 +153,6 @@ namespace ShiftOS.Engine {
         [ShifterDescription("The font style used by the system.")]
         public Font MainFont = SysFont;
         
-        [Image("mouse")]
-        [ShifterMeta("System")]
-        [ShifterCategory("General")]
-        [ShifterName("Mouse image")]
-        [ShifterDescription("Select an image to be displayed as the system mouse cursor.")]
-        [RequiresUpgrade("skinning")]
-        public byte[] MouseCursorImage = null;
-
         [ShifterEnumMask(new[] { "Right", "Left"})]
         [ShifterMeta("Windows")]
         [ShifterCategory("Title Buttons")]