aboutsummaryrefslogtreecommitdiff
path: root/Histacom2/OS/Win98
diff options
context:
space:
mode:
Diffstat (limited to 'Histacom2/OS/Win98')
-rw-r--r--Histacom2/OS/Win98/Win98.Designer.cs21
-rw-r--r--Histacom2/OS/Win98/Win98.cs52
-rw-r--r--Histacom2/OS/Win98/Win98.resx5
3 files changed, 54 insertions, 24 deletions
diff --git a/Histacom2/OS/Win98/Win98.Designer.cs b/Histacom2/OS/Win98/Win98.Designer.cs
index b6ba606..b8fc6ea 100644
--- a/Histacom2/OS/Win98/Win98.Designer.cs
+++ b/Histacom2/OS/Win98/Win98.Designer.cs
@@ -109,6 +109,7 @@ namespace Histacom2.OS.Win98
this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.desktopupdate = new System.Windows.Forms.Timer(this.components);
+ this.waitUntil98Loaded = new System.Windows.Forms.Timer(this.components);
this.panel1.SuspendLayout();
this.taskbar.SuspendLayout();
this.clockPanel.SuspendLayout();
@@ -770,7 +771,7 @@ namespace Histacom2.OS.Win98
this.ControlPanelToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ControlPanelToolStripMenuItem.BackgroundImage")));
this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem";
- this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
this.ControlPanelToolStripMenuItem.Text = "Control Panel";
//
// PrintersToolStripMenuItem
@@ -779,7 +780,7 @@ namespace Histacom2.OS.Win98
this.PrintersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PrintersToolStripMenuItem.BackgroundImage")));
this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem";
- this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
this.PrintersToolStripMenuItem.Text = "Printers";
//
// TaskbarToolStripMenuItem
@@ -788,7 +789,7 @@ namespace Histacom2.OS.Win98
this.TaskbarToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("TaskbarToolStripMenuItem.BackgroundImage")));
this.TaskbarToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TaskbarToolStripMenuItem.Name = "TaskbarToolStripMenuItem";
- this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
this.TaskbarToolStripMenuItem.Text = "Taskbar";
//
// FindToolStripMenuItem
@@ -815,7 +816,7 @@ namespace Histacom2.OS.Win98
this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage")));
this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem";
- this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders...";
//
// ComputerToolStripMenuItem
@@ -824,7 +825,7 @@ namespace Histacom2.OS.Win98
this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage")));
this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem";
- this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
this.ComputerToolStripMenuItem.Text = "Computer...";
//
// OnTheInternetToolStripMenuItem
@@ -833,7 +834,7 @@ namespace Histacom2.OS.Win98
this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage")));
this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem";
- this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
this.OnTheInternetToolStripMenuItem.Text = "On the Internet...";
//
// PeopleToolStripMenuItem
@@ -842,7 +843,7 @@ namespace Histacom2.OS.Win98
this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage")));
this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem";
- this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
this.PeopleToolStripMenuItem.Text = "People...";
//
// HelpToolStripMenuItem
@@ -1006,6 +1007,11 @@ namespace Histacom2.OS.Win98
this.desktopupdate.Interval = 5000;
this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick);
//
+ // waitUntil98Loaded
+ //
+ this.waitUntil98Loaded.Enabled = true;
+ this.waitUntil98Loaded.Tick += new System.EventHandler(this.waitUntil98Loaded_Tick);
+ //
// Windows98
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1118,5 +1124,6 @@ namespace Histacom2.OS.Win98
private System.Windows.Forms.ToolStripMenuItem storyTest1ToolStripMenuItem;
private System.Windows.Forms.Timer desktopupdate;
private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem;
+ private System.Windows.Forms.Timer waitUntil98Loaded;
}
} \ No newline at end of file
diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Win98.cs
index e9a7d60..3a0b216 100644
--- a/Histacom2/OS/Win98/Win98.cs
+++ b/Histacom2/OS/Win98/Win98.cs
@@ -33,6 +33,17 @@ namespace Histacom2.OS.Win98
public bool hiddenpadamsFound = false;
public WinClassicTimeDistorter2 distort;
+
+ // Overrides the Painting function of the Form, so that you don't see all that crap drawing.
+ protected override CreateParams CreateParams
+ {
+ get
+ {
+ CreateParams cp = base.CreateParams;
+ cp.ExStyle |= 0x02000000; // Turn on WS_EX_COMPOSITED
+ return cp;
+ }
+ }
// Init the form
public Windows98()
@@ -115,22 +126,6 @@ namespace Histacom2.OS.Win98
// Bring to this the front
this.BringToFront();
- //Check if it is the first time
- if (!CurrentSave.FTime98)
- {
- CurrentSave.FTime98 = true;
- SaveGame();
- welcome = wm.Init(new Win98Welcome(), "Welcome", null, false, false, resize: false);
- AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
-
- nonimportantapps.Add(welcome);
- nonimportantapps[nonimportantapps.Count - 1].BringToFront();
- nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
-
- welcome.BringToFront();
- welcome.Activate();
- }
-
// Update the desktop Icons!
DesktopController.RefreshDesktopIcons(new ListViewItem[] { new System.Windows.Forms.ListViewItem("My Computer", 0),
@@ -572,6 +567,31 @@ namespace Histacom2.OS.Win98
}
}
}
+
+ private void waitUntil98Loaded_Tick(object sender, EventArgs e)
+ {
+ if (Visible)
+ {
+ //Check if it is the first time
+ if (!CurrentSave.FTime98)
+ {
+ CurrentSave.FTime98 = true;
+ SaveGame();
+ welcome = wm.Init(new Win98Welcome(), "Welcome", null, false, false, resize: false);
+ AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
+
+ nonimportantapps.Add(welcome);
+ nonimportantapps[nonimportantapps.Count - 1].BringToFront();
+ nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
+
+ welcome.BringToFront();
+ welcome.Activate();
+
+ waitUntil98Loaded.Enabled = false;
+ }
+
+ }
+ }
}
}
diff --git a/Histacom2/OS/Win98/Win98.resx b/Histacom2/OS/Win98/Win98.resx
index 7f02550..28744a3 100644
--- a/Histacom2/OS/Win98/Win98.resx
+++ b/Histacom2/OS/Win98/Win98.resx
@@ -382,7 +382,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq
- ggAAAk1TRnQBSQFMAgEBDAEAAbABAQGwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+ ggAAAk1TRnQBSQFMAgEBDAEAAbgBAQG4AQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/
@@ -949,6 +949,9 @@
<metadata name="desktopupdate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>714, 17</value>
</metadata>
+ <metadata name="waitUntil98Loaded.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>848, 17</value>
+ </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>63</value>
</metadata>
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-04 04:28:44 +0000