Merge pull request #7 from reflectronic/netcorenet-core

Port to .NET Core

4 files changed, 4 insertions, 4 deletions

diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs
index 9db9785..413024e 100644
--- a/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs
+++ b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs
@@ -123,4 +123,4 @@
         private System.Windows.Forms.Timer timer1;
         public Engine.UI.ClassicLabel classicLabel2;
     }
-}
+}
\ No newline at end of file
diff --git a/Histacom2/OS/Win98/Win98.Designer.cs b/Histacom2/OS/Win98/Windows98.Designer.cs
index b8fc6ea..b8fc6ea 100644
--- a/Histacom2/OS/Win98/Win98.Designer.cs
+++ b/Histacom2/OS/Win98/Windows98.Designer.cs
diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Windows98.cs
index 36939a8..820f01c 100644
--- a/Histacom2/OS/Win98/Win98.cs
+++ b/Histacom2/OS/Win98/Windows98.cs
@@ -6,12 +6,12 @@ using System.Media;
 using System.Windows.Forms;
 using Histacom2.Engine;
 using Histacom2.Engine.Template;
-using Histacom2.Engine.Template.Taskbars;
 using Histacom2.OS.Win95.Win95Apps;
 using Histacom2.OS.Win95.Win95Apps.Story;
 using static Histacom2.Engine.SaveSystem;
 using Histacom2.OS.Win98.Win98Apps;
 using Histacom2.GlobalPrograms;
+using Histacom2.OS.Win95;
 
 namespace Histacom2.OS.Win98
 {
@@ -381,7 +381,7 @@ namespace Histacom2.OS.Win98
 
         public void AddTaskBarItem(Form Application, string ApplicationID, string ApplicationName, Image ApplicationIcon)
         {
-            taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Win95TaskBarItem(), taskbarItems);
+            taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Windows95TaskbarItem(), taskbarItems);
             Application.FormClosed += new FormClosedEventHandler(UpdateTaskbarFromClosedApplication);
         }
 
@@ -400,7 +400,7 @@ namespace Histacom2.OS.Win98
             foreach (Form form in tb.GetAllOpenApps())
             {
                 // Calls that "AddToTaskbar" thing
-                taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), (Image)form.Icon.ToBitmap(), (UserControl)new Win95TaskBarItem(), taskbarItems);
+                taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), (Image)form.Icon.ToBitmap(), (UserControl)new Windows95TaskbarItem(), taskbarItems);
             }
         }
 
diff --git a/Histacom2/OS/Win98/Win98.resx b/Histacom2/OS/Win98/Windows98.resx
index 28744a3..28744a3 100644
--- a/Histacom2/OS/Win98/Win98.resx
+++ b/Histacom2/OS/Win98/Windows98.resx