aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Main/OS/Win98
diff options
context:
space:
mode:
authorAlex-TIMEHACK <[email protected]>2017-07-21 13:24:28 +0100
committerAlex-TIMEHACK <[email protected]>2017-07-21 13:24:28 +0100
commit75c05d35535267096b0c46e143be7a55bb21c9c4 (patch)
treeb9f175812ff8fde1f982ee0667a3853572ec8259 /TimeHACK.Main/OS/Win98
parentfee528f280640948216f41f0569c79a6552e61c7 (diff)
parenta42b7b8d3219f5df18721afdf88bddb8dd11d463 (diff)
downloadhistacom2-75c05d35535267096b0c46e143be7a55bb21c9c4.tar.gz
histacom2-75c05d35535267096b0c46e143be7a55bb21c9c4.tar.bz2
histacom2-75c05d35535267096b0c46e143be7a55bb21c9c4.zip
Update My Fork PART 2!!!
Diffstat (limited to 'TimeHACK.Main/OS/Win98')
-rw-r--r--TimeHACK.Main/OS/Win98/Win98.Designer.cs12
-rw-r--r--TimeHACK.Main/OS/Win98/Win98.cs14
2 files changed, 2 insertions, 24 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..d65a9ed 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();
@@ -271,7 +261,7 @@ namespace TimeHACK.OS.Win98
private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e)
{
- WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text, Image erroricon)!", Properties.Resources.Win95Info);
+ WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(string title, string text, Image erroricon)!", Properties.Resources.Win95Info);
app.BringToFront();
startmenu.Hide();
@@ -366,7 +356,7 @@ namespace TimeHACK.OS.Win98
private void storyTest1ToolStripMenuItem_Click(object sender, EventArgs e)
{
- Hack1.startObjective();
+ Hack1.StartObjective();
}
private void temp_for_std(object sender, EventArgs e)