Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'

2 files changed, 0 insertions, 22 deletions

diff --git a/TimeHACK.Main/OS/Win98/Win98.Designer.cs b/TimeHACK.Main/OS/Win98/Win98.Designer.cs
index d07670b..3762187 100644
--- a/TimeHACK.Main/OS/Win98/Win98.Designer.cs
+++ b/TimeHACK.Main/OS/Win98/Win98.Designer.cs
@@ -89,7 +89,6 @@ namespace TimeHACK.OS.Win98
             this.WebChatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.TimeDistorterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.DocumentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.windowManagerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.downloaderTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.installerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.storyTest1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -730,7 +729,6 @@ namespace TimeHACK.OS.Win98
             this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
             this.DocumentsToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.DocumentsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.windowManagerTestToolStripMenuItem,
             this.downloaderTestToolStripMenuItem,
             this.installerTestToolStripMenuItem,
             this.storyTest1ToolStripMenuItem});
@@ -742,15 +740,6 @@ namespace TimeHACK.OS.Win98
             this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(138, 36);
             this.DocumentsToolStripMenuItem.Text = "Documents";
             // 
-            // windowManagerTestToolStripMenuItem
-            // 
-            this.windowManagerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
-            this.windowManagerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("windowManagerTestToolStripMenuItem.BackgroundImage")));
-            this.windowManagerTestToolStripMenuItem.Name = "windowManagerTestToolStripMenuItem";
-            this.windowManagerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
-            this.windowManagerTestToolStripMenuItem.Text = "WindowManagerTest";
-            this.windowManagerTestToolStripMenuItem.Click += new System.EventHandler(this.windowManagerTestToolStripMenuItem_Click);
-            // 
             // downloaderTestToolStripMenuItem
             // 
             this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
@@ -1261,7 +1250,6 @@ namespace TimeHACK.OS.Win98
         internal System.Windows.Forms.ToolStripMenuItem MicrosoftDataLinkToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem PropertiesToolStripMenuItem1;
         internal System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95));
-        private System.Windows.Forms.ToolStripMenuItem windowManagerTestToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem downloaderTestToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem;
         private System.Windows.Forms.Panel taskbarItems;
diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs
index 175719a..fa3fbfa 100644
--- a/TimeHACK.Main/OS/Win98/Win98.cs
+++ b/TimeHACK.Main/OS/Win98/Win98.cs
@@ -8,7 +8,6 @@ using TimeHACK.Engine;
 using TimeHACK.Engine.Template;
 using TimeHACK.Engine.Template.Taskbars;
 using TimeHACK.OS.Win95.Win95Apps;
-using TimeHACK.WinClassicForms;
 using TimeHACK.OS.Win95.Win95Apps.Story;
 
 namespace TimeHACK.OS.Win98
@@ -195,15 +194,6 @@ namespace TimeHACK.OS.Win98
             app.BringToFront();
             startmenu.Hide();
         }
-        private void windowManagerTestToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            TestApp test = new TestApp();
-            WinClassic app = wm.StartWin95(test, "TestApp", null, true, true);
-            AddTaskBarItem(app, app.Tag.ToString(), "TestApp", null);
-            app.BringToFront();
-            startmenu.Hide();
-        }
-
         private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
             WinClassicDownloader opendownload = new WinClassicDownloader();