From fbdca852b1fc901db6a09fc22fd523160489f7ed Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 9 Apr 2017 14:05:04 -0400 Subject: added notepad --- TimeHACK.Engine/WindowManager.cs | 10 +++------- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 128512 -> 128512 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 34304 -> 34304 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 128512 -> 128512 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 34304 -> 34304 bytes 5 files changed, 3 insertions(+), 7 deletions(-) (limited to 'TimeHACK.Engine') diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index d0a95c0..4c1eefe 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -10,7 +10,7 @@ namespace TimeHACK.Engine public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); - public WinClassic startWin95(UserControl content, String title, PictureBox icon, Boolean MaxButton, Boolean MinButton) + public WinClassic startWin95(UserControl content, String title, Image icon, Boolean MaxButton, Boolean MinButton) { // Setup Window WinClassic app = new WinClassic(); @@ -29,12 +29,8 @@ namespace TimeHACK.Engine content.Dock = DockStyle.Fill; // Check if icon is null - if (icon == null) - { - icon = app.programIcon; - icon.Image = Engine.Properties.Resources.nullIcon; - } - app.programIcon.Image = icon.Image; + if (icon == null) app.programIcon.Image = Engine.Properties.Resources.nullIcon; + else app.programIcon.Image = icon; // Check if Max button is enabled and set proper X for Min button if (MaxButton == false) diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index e93af1f..f83065b 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb index 11be1ff..1f05a8c 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index e93af1f..f83065b 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb index 11be1ff..1f05a8c 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb differ -- cgit v1.2.3