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

2 files changed, 10 insertions, 53 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs
index db9a7e9..465e375 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs
@@ -111,7 +111,6 @@
             this.newToolStripMenuItem.Name = "newToolStripMenuItem";
             this.newToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
             this.newToolStripMenuItem.Text = "New";
-            this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
             // 
             // toolStripSeparator1
             // 
@@ -123,14 +122,12 @@
             this.sendToolStripMenuItem.Name = "sendToolStripMenuItem";
             this.sendToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
             this.sendToolStripMenuItem.Text = "Send...";
-            this.sendToolStripMenuItem.Click += new System.EventHandler(this.sendToolStripMenuItem_Click);
             // 
             // exitToolStripMenuItem
             // 
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
             this.exitToolStripMenuItem.Size = new System.Drawing.Size(109, 22);
             this.exitToolStripMenuItem.Text = "Exit";
-            this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
             // 
             // editToolStripMenuItem
             // 
@@ -258,7 +255,6 @@
             this.bulletStyleToolStripMenuItem.Name = "bulletStyleToolStripMenuItem";
             this.bulletStyleToolStripMenuItem.Size = new System.Drawing.Size(131, 22);
             this.bulletStyleToolStripMenuItem.Text = "Bullet style";
-            this.bulletStyleToolStripMenuItem.Click += new System.EventHandler(this.bulletStyleToolStripMenuItem_Click);
             // 
             // helpToolStripMenuItem
             // 
@@ -286,7 +282,6 @@
             this.aboutWordpadToolStripMenuItem.Name = "aboutWordpadToolStripMenuItem";
             this.aboutWordpadToolStripMenuItem.Size = new System.Drawing.Size(159, 22);
             this.aboutWordpadToolStripMenuItem.Text = "About Wordpad";
-            this.aboutWordpadToolStripMenuItem.Click += new System.EventHandler(this.aboutWordpadToolStripMenuItem_Click);
             // 
             // mainText
             // 
@@ -350,7 +345,6 @@
             this.btnNew.Size = new System.Drawing.Size(26, 23);
             this.btnNew.TabIndex = 1;
             this.btnNew.UseVisualStyleBackColor = true;
-            this.btnNew.Click += new System.EventHandler(this.btnNew_Click);
             // 
             // pictureBox1
             // 
@@ -404,7 +398,6 @@
             this.comboSize.Size = new System.Drawing.Size(50, 21);
             this.comboSize.TabIndex = 1;
             this.comboSize.Text = "12";
-            this.comboSize.SelectedIndexChanged += new System.EventHandler(this.comboSize_SelectedIndexChanged);
             // 
             // comboFont
             // 
@@ -414,7 +407,6 @@
             this.comboFont.Size = new System.Drawing.Size(145, 21);
             this.comboFont.TabIndex = 1;
             this.comboFont.Text = "Arial";
-            this.comboFont.SelectedIndexChanged += new System.EventHandler(this.comboFont_SelectedIndexChanged);
             // 
             // pictureBox2
             // 
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
index ebcbf56..bf0cb16 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs
@@ -43,6 +43,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                 comboFont.Items.Add(font.Name);
             }
 
+            // Handlers
             this.clearToolStripMenuItem.Click += (sender, args) => mainText.Text = mainText.Text.Remove(mainText.SelectionStart, mainText.SelectedText.Length);
             this.pasteToolStripMenuItem.Click += (sender, args) => mainText.Paste();
             this.btnPaste.Click += (sender, args) => mainText.Paste();
@@ -56,6 +57,14 @@ namespace TimeHACK.OS.Win95.Win95Apps
             this.toolbarToolStripMenuItem.Click += (sender, args) => pnlToolbar.Visible = toolbarToolStripMenuItem.Checked;
             this.formatBarToolStripMenuItem.Click += (sender, args) => pnlFormatBar.Visible = formatBarToolStripMenuItem.Checked;
             this.statusBarToolStripMenuItem.Click += (sender, args) => statusBar.Visible = statusBarToolStripMenuItem.Checked;
+            this.exitToolStripMenuItem.Click += (sender, args) => ((Form)this.TopLevelControl).Close();
+            this.aboutWordpadToolStripMenuItem.Click += (sender, args) => wm.StartAboutBox95("Wordpad", "Microsoft Wordpad", Properties.Resources.Win95IconWordpad);
+            this.btnNew.Click += (sender, args) => mainText.Text = "";
+            this.newToolStripMenuItem.Click += (sender, args) => mainText.Text = "";
+            this.sendToolStripMenuItem.Click += (sender, args) => wm.StartInfobox95("Wordpad", "An error occured opening send option.", null);
+            this.bulletStyleToolStripMenuItem.Click += (sender, args) => mainText.SelectionBullet = bulletStyleToolStripMenuItem.Checked;
+            this.comboFont.SelectedIndexChanged += (sender, args) => SetSelectedTextFont(comboFont.Text);
+            this.comboSize.SelectedIndexChanged += (sender, args) => SetSelectedTextSize(comboSize.Text);
         }
 
         #region Format_Buttons
@@ -110,46 +119,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         #endregion
 
         #region Designer-Stuff
-
-        private void exitToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            ((Form)this.TopLevelControl).Close();
-        }
-
-        private void aboutWordpadToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            wm.StartAboutBox95("Wordpad", "Microsoft Wordpad", Properties.Resources.Win95IconWordpad);
-        }
-
-        private void newToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            NewFile();
-        }
-
-        private void btnNew_Click(object sender, EventArgs e)
-        {
-            NewFile();
-        }
-
-        private void sendToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            wm.StartInfobox95("Wordpad", "An error occured opening send option.", null);
-        }
-
-        private void bulletStyleToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            mainText.SelectionBullet = bulletStyleToolStripMenuItem.Checked;
-        }
-
-        private void comboFont_SelectedIndexChanged(object sender, EventArgs e)
-        {           
-            SetSelectedTextFont(comboFont.Text);
-        }
-
-        private void comboSize_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            SetSelectedTextSize(comboSize.Text);
-        }
+        
         private void btnBold_MouseEnter(object sender, EventArgs e)
         {
             lblStatus.Text = "Makes the selected text Bold. (toggle)";
@@ -181,11 +151,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
         }
         #endregion
 
-        void NewFile()
-        {
-            mainText.Text = "";
-        }
-
         // Things for Cut/Copy/Paste have been placed in the "Designer-Stuff" region!
 
         void SetSelectedTextFont(string font)