merge with master builds

1 files changed, 6 insertions, 16 deletions

diff --git a/grapher/Form1.cs b/grapher/Form1.cs
index 06f76f1..71a5e01 100644
--- a/grapher/Form1.cs
+++ b/grapher/Form1.cs
@@ -69,6 +69,7 @@ namespace grapher
                 gainOffsetToolStripMenuItem,
                 legacyOffsetToolStripMenuItem,
                 AutoWriteMenuItem,
+                UseSpecificDeviceMenuItem,
                 ScaleMenuItem,
                 DPITextBox,
                 PollRateTextBox,
@@ -173,19 +174,18 @@ namespace grapher
 
         protected override void WndProc(ref Message m)
         {
-            if (m.Msg == 0x00ff)
+            if (m.Msg == 0x00ff) // WM_INPUT
             {
                 AccelGUI.MouseWatcher.ReadMouseMove(m);
             }
+            else if (m.Msg == 0x00fe) // WM_INPUT_DEVICE_CHANGE
+            {
+                AccelGUI.UpdateInputManagers();
+            }
 
             base.WndProc(ref m);
         }
 
-        private void Form1_Load(object sender, EventArgs e)
-        {
-
-        }
-
         public void ResetAutoScroll()
         {
             chartsPanel.AutoScrollPosition = Constants.Origin;
@@ -205,16 +205,6 @@ namespace grapher
             };
         }
 
-        private void RawAcceleration_Paint(object sender, PaintEventArgs e)
-        {
-            //AccelGUI.AccelCharts.DrawLastMovement();
-        }
-
         #endregion Method
-
-        private void optionsPanel_Paint(object sender, PaintEventArgs e)
-        {
-
-        }
     }
 }