Merge pull request #17 from MichaelTheShifter/shiftui_integration

Shiftui integration

1 files changed, 6 insertions, 2 deletions

diff --git a/source/WindowsFormsApplication1/Apps/Cheats.cs b/source/WindowsFormsApplication1/Apps/Cheats.cs
index 9caaa7f..d477cd9 100644
--- a/source/WindowsFormsApplication1/Apps/Cheats.cs
+++ b/source/WindowsFormsApplication1/Apps/Cheats.cs
@@ -6,7 +6,11 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+<<<<<<< HEAD
+using ShiftUI;
+=======
 using System.Windows.Forms;
+>>>>>>> refs/remotes/origin/master
 using ShiftOS.Online.Hacking;
 
 namespace ShiftOS.Apps
@@ -20,7 +24,7 @@ namespace ShiftOS.Apps
 
         public void SetOptionsEnabled(bool enabled)
         {
-            foreach (Control control in this.Controls)
+            foreach (Widget control in this.Widgets)
             {
                 if (control != progressDisplay)
                 {
@@ -56,7 +60,7 @@ namespace ShiftOS.Apps
             bool isInt = Int32.TryParse(AddMoneyQty.Text, out qty);
             if (!isInt)
             {
-                MessageBox.Show("Not a Number", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                MessageBox.Show("Not a Number", "Error");
                 return;
             }
             ShiftOS.API.AddCodepoints(qty);