buttons and window colors

4 files changed, 31 insertions, 46 deletions

diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
index ee8021c..6b92d11 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
@@ -31,9 +31,9 @@
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.comboBox1 = new System.Windows.Forms.ComboBox();
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.applyButton = new System.Windows.Forms.Button();
-            this.cancelButton = new System.Windows.Forms.Button();
-            this.okButton = new System.Windows.Forms.Button();
+            this.applyButton = new Histacom2.Engine.UI.ClassicButton();
+            this.cancelButton = new Histacom2.Engine.UI.ClassicButton();
+            this.okButton = new Histacom2.Engine.UI.ClassicButton();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             this.SuspendLayout();
@@ -73,35 +73,29 @@
             // 
             // applyButton
             // 
-            this.applyButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.applyButton.Location = new System.Drawing.Point(209, 245);
             this.applyButton.Name = "applyButton";
             this.applyButton.Size = new System.Drawing.Size(75, 23);
             this.applyButton.TabIndex = 3;
             this.applyButton.Text = "Apply";
-            this.applyButton.UseVisualStyleBackColor = true;
             this.applyButton.Click += new System.EventHandler(this.applyButton_Click);
             // 
             // cancelButton
             // 
-            this.cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.cancelButton.Location = new System.Drawing.Point(128, 245);
             this.cancelButton.Name = "cancelButton";
             this.cancelButton.Size = new System.Drawing.Size(75, 23);
             this.cancelButton.TabIndex = 4;
             this.cancelButton.Text = "Cancel";
-            this.cancelButton.UseVisualStyleBackColor = true;
             this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click);
             // 
             // okButton
             // 
-            this.okButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.okButton.Location = new System.Drawing.Point(47, 245);
             this.okButton.Name = "okButton";
             this.okButton.Size = new System.Drawing.Size(75, 23);
             this.okButton.TabIndex = 5;
             this.okButton.Text = "OK";
-            this.okButton.UseVisualStyleBackColor = true;
             this.okButton.Click += new System.EventHandler(this.okButton_Click);
             // 
             // WinClassicThemePanel
@@ -129,8 +123,8 @@
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.ComboBox comboBox1;
         private System.Windows.Forms.PictureBox pictureBox2;
-        private System.Windows.Forms.Button applyButton;
-        private System.Windows.Forms.Button cancelButton;
-        private System.Windows.Forms.Button okButton;
+        private Histacom2.Engine.UI.ClassicButton applyButton;
+        private Histacom2.Engine.UI.ClassicButton cancelButton;
+        private Histacom2.Engine.UI.ClassicButton okButton;
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
index fb790cb..da354bf 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
@@ -95,6 +95,8 @@ namespace Histacom2.OS.Win95.Win95Apps
                         ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.inactiveTitleBarColor;
                         ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor;
                     }
+                    f.Invalidate();
+                    foreach (Control c in f.Controls) c.Invalidate();
                 }
             }
         }
@@ -136,6 +138,8 @@ namespace Histacom2.OS.Win95.Win95Apps
                         ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.inactiveTitleBarColor;
                         ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor;
                     }
+                    f.Invalidate();
+                    foreach (Control c in f.Controls) c.Invalidate();
                 }
             }
             ParentForm.Close();
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs
index ca3f22d..8c1f84a 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs
@@ -30,10 +30,10 @@
         {
             this.imgTip = new System.Windows.Forms.PictureBox();
             this.imgPnl = new System.Windows.Forms.PictureBox();
-            this.btnClose = new System.Windows.Forms.Button();
-            this.btnOnline = new System.Windows.Forms.Button();
-            this.btnTour = new System.Windows.Forms.Button();
             this.imgWelcome = new System.Windows.Forms.PictureBox();
+            this.btnClose = new Histacom2.Engine.UI.ClassicButton();
+            this.btnOnline = new Histacom2.Engine.UI.ClassicButton();
+            this.btnTour = new Histacom2.Engine.UI.ClassicButton();
             ((System.ComponentModel.ISupportInitialize)(this.imgTip)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.imgPnl)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.imgWelcome)).BeginInit();
@@ -59,52 +59,46 @@
             this.imgPnl.TabIndex = 16;
             this.imgPnl.TabStop = false;
             // 
+            // imgWelcome
+            // 
+            this.imgWelcome.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcome;
+            this.imgWelcome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+            this.imgWelcome.Location = new System.Drawing.Point(19, 17);
+            this.imgWelcome.Name = "imgWelcome";
+            this.imgWelcome.Size = new System.Drawing.Size(292, 19);
+            this.imgWelcome.TabIndex = 18;
+            this.imgWelcome.TabStop = false;
+            // 
             // btnClose
             // 
             this.btnClose.BackColor = System.Drawing.Color.Silver;
-            this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnClose.ForeColor = System.Drawing.Color.Black;
             this.btnClose.Location = new System.Drawing.Point(358, 156);
             this.btnClose.Name = "btnClose";
             this.btnClose.Size = new System.Drawing.Size(115, 26);
             this.btnClose.TabIndex = 15;
             this.btnClose.Text = "Close";
-            this.btnClose.UseVisualStyleBackColor = false;
             this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
             // 
             // btnOnline
             // 
             this.btnOnline.BackColor = System.Drawing.Color.Silver;
-            this.btnOnline.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnOnline.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnOnline.ForeColor = System.Drawing.Color.Black;
             this.btnOnline.Location = new System.Drawing.Point(356, 78);
             this.btnOnline.Name = "btnOnline";
             this.btnOnline.Size = new System.Drawing.Size(115, 26);
             this.btnOnline.TabIndex = 14;
-            this.btnOnline.Text = "Online Registration";
-            this.btnOnline.UseVisualStyleBackColor = false;
+            this.btnOnline.Text = "&Online Registration";
             // 
             // btnTour
             // 
             this.btnTour.BackColor = System.Drawing.Color.Silver;
-            this.btnTour.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnTour.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnTour.ForeColor = System.Drawing.Color.Black;
             this.btnTour.Location = new System.Drawing.Point(356, 49);
             this.btnTour.Name = "btnTour";
             this.btnTour.Size = new System.Drawing.Size(115, 26);
             this.btnTour.TabIndex = 12;
-            this.btnTour.Text = "What\'s New";
-            this.btnTour.UseVisualStyleBackColor = false;
-            // 
-            // imgWelcome
-            // 
-            this.imgWelcome.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcome;
-            this.imgWelcome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
-            this.imgWelcome.Location = new System.Drawing.Point(19, 17);
-            this.imgWelcome.Name = "imgWelcome";
-            this.imgWelcome.Size = new System.Drawing.Size(292, 19);
-            this.imgWelcome.TabIndex = 18;
-            this.imgWelcome.TabStop = false;
+            this.btnTour.Text = "What\'s &New";
             // 
             // WinClassicWelcome
             // 
@@ -130,9 +124,9 @@
 
         private System.Windows.Forms.PictureBox imgTip;
         private System.Windows.Forms.PictureBox imgPnl;
-        private System.Windows.Forms.Button btnClose;
-        private System.Windows.Forms.Button btnOnline;
-        private System.Windows.Forms.Button btnTour;
+        private Histacom2.Engine.UI.ClassicButton btnClose;
+        private Histacom2.Engine.UI.ClassicButton btnOnline;
+        private Histacom2.Engine.UI.ClassicButton btnTour;
         private System.Windows.Forms.PictureBox imgWelcome;
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs
index 4804ca5..6ec79a4 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs
@@ -15,13 +15,6 @@ namespace Histacom2.OS.Win95.Win95Apps
         public WinClassicWelcome()
         {
             InitializeComponent();
-
-            btnTour.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
-            btnTour.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
-            btnOnline.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
-            btnOnline.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
-            btnClose.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
-            btnClose.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); 
         }
 
         private void btnClose_Click(object sender, EventArgs e)