Krypton-Suite · PWagner1 · May 6, 2024 · May 6, 2024 · May 6, 2024 · May 6, 2024
diff --git a/Documents/Help/Changelog.md b/Documents/Help/Changelog.md
@@ -3,6 +3,7 @@
 =======
 
 ## 2024-11-xx - Build 2411 - November 2024
+* Implemented [#1435](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1435), **Breaking Change** Take KMB back to the Winform override (Remove Checkbox etc)
 * Implemented [#1432](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1432), Copy `KryptonMessageBox` to `KryptonMessageBoxDep`
 * Resolved [#1424](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1424), **Breaking Change** `KryptonMessageBox` does not obey tab characters like `MessageBox`
 * Resolved [#1381](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1381), **[Regression]** Docking Persistence broken since build ##.23.10.303

diff --git a/README.md b/README.md
@@ -185,7 +185,8 @@ Follow the links to see the different objects and layouts that this framework al
 
 ## V90.## (2024-11-xx - Build 2411 - November 2024)
 There are list of changes that have occurred during the development of the V90.## version
-- [#1432](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1432), **Breaking Change placeholder** Copy `KryptonMessageBox` to `KryptonMessageBoxDep`
+- [#1435](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1435), **Breaking Change** Take KMB back to the Winform override (Remove Checkbox etc)
+- and [#1432](https://github.com/Krypton-Suite/Standard-Toolkit/issues/1432), **Breaking Change placeholder** Copy `KryptonMessageBox` to `KryptonMessageBoxDep`
   - The introduction of new Parameters elements to the `KryptonMessageBox` is now supported in the `KryptonMessageBoxDep` class
   - This is so that the `KryptonMessageBox` gets back to being a drop in replacement for the winform `MessageBox`
   - And a start of the introduction of the `KryptonMessageDialog` implementation of the UWP `MessageDialog`

diff --git a/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs b/Source/Krypton Components/Krypton.Navigator/View Builder/ViewBuilderOutlookBase.cs
@@ -2381,8 +2381,15 @@ private void RecreateView()
                 ViewDrawBorderEdge? buttonEdge = _buttonEdgeLookup?[page];
 
                 // Add to the end of the collection
-                if (buttonEdge != null) _viewLayout.Add(buttonEdge, dockFar);
-                if (checkButton != null) _viewLayout.Add(checkButton, dockFar);
+                if (buttonEdge != null)
+                {
+                    _viewLayout.Add(buttonEdge, dockFar);
+                }
+
+                if (checkButton != null)
+                {
+                    _viewLayout.Add(checkButton, dockFar);
+                }
             }
         }
         #endregion

diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBox.cs
diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBoxDep.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonMessageBoxDep.cs
@@ -1,11 +1,7 @@
 #region BSD License
 /*
- * 
- * Original BSD 3-Clause License (https://github.com/ComponentFactory/Krypton/blob/master/LICENSE)
- *  © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved.
- * 
  *  New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE)
- *  Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2024. All rights reserved. 
+ *  Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2024 - 2024. All rights reserved. 
  *  
  */
 #endregion
@@ -321,7 +317,7 @@ public static DialogResult Show(IWin32Window? owner, string text, string caption
         /// <summary>Displays a message box with the specified text, caption, buttons, icon, default button, options, and Help button, using the specified Help file, HelpNavigator, and Help topic.</summary>
         /// <param name="messageBoxData">The message box data.</param>
         /// <returns>One of the System.Windows.Forms.DialogResult values.</returns>
-        public static DialogResult Show(KryptonMessageBoxData messageBoxData) => ShowCore(messageBoxData);
+        public static DialogResult Show(KryptonMessageBoxDataDep messageBoxData) => ShowCore(messageBoxData);
 
         #endregion
 
@@ -396,7 +392,7 @@ private static DialogResult ShowCore(IWin32Window? owner,
             }
         }
 
-        private static DialogResult ShowCore(KryptonMessageBoxData messageBoxData)
+        private static DialogResult ShowCore(KryptonMessageBoxDataDep messageBoxData)
         {
             messageBoxData.Caption = string.IsNullOrEmpty(messageBoxData.Caption) ? @" " : messageBoxData.Caption;
 

diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonThemeComboBox.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonThemeComboBox.cs
@@ -58,7 +58,11 @@ public PaletteMode DefaultPalette
 
             set
             {
-                if (_defaultPalette == value) return;
+                if (_defaultPalette == value)
+                {
+                    return;
+                }
+
                 if (_handleCreated)
                 {
                     // Safe to directly access UI thread now
@@ -149,15 +153,22 @@ public KryptonThemeComboBox()
         private void KryptonThemeComboBox_HandleCreated(object sender, EventArgs e)
         {
             _handleCreated = true;
-            if (!_pendingPaletteUpdate) return;
+            if (!_pendingPaletteUpdate)
+            {
+                return;
+            }
 
             _pendingPaletteUpdate = false;
             DefaultPalette = _pendingPaletteMode;
         }
 
         private void UpdateDefaultPaletteIndex(PaletteMode mode)
         {
-            if (_isUpdating) return;
+            if (_isUpdating)
+            {
+                return;
+            }
+
             _isUpdating = true;
 
             var selectedText = ThemeManager.ReturnPaletteModeAsString(mode);

diff --git a/...ntrols Visuals/Notification Toast/Basic/Left to Right/VisualToastNotificationBasicForm.cs b/...ntrols Visuals/Notification Toast/Basic/Left to Right/VisualToastNotificationBasicForm.cs
@@ -149,7 +149,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }

diff --git a/...Notification Toast/Basic/Left to Right/VisualToastNotificationBasicWithProgressBarForm.cs b/...Notification Toast/Basic/Left to Right/VisualToastNotificationBasicWithProgressBarForm.cs
@@ -145,7 +145,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }

diff --git a/...isuals/Notification Toast/Basic/Right to Left/VisualToastNotificationBasicRtlAwareForm.cs b/...isuals/Notification Toast/Basic/Right to Left/VisualToastNotificationBasicRtlAwareForm.cs
@@ -145,7 +145,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }

diff --git a/...tion Toast/Basic/Right to Left/VisualToastNotificationBasicWithProgressBarRtlAwareForm.cs b/...tion Toast/Basic/Right to Left/VisualToastNotificationBasicWithProgressBarRtlAwareForm.cs
@@ -145,7 +145,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }

diff --git a/...ion Toast/User Input/Left to Right/Normal/VisualToastNotificationComboBoxUserInputForm.cs b/...ion Toast/User Input/Left to Right/Normal/VisualToastNotificationComboBoxUserInputForm.cs
@@ -128,7 +128,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -142,7 +142,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/...ion Toast/User Input/Left to Right/Normal/VisualToastNotificationDateTimeUserInputForm.cs b/...ion Toast/User Input/Left to Right/Normal/VisualToastNotificationDateTimeUserInputForm.cs
@@ -127,7 +127,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -141,7 +141,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/...Toast/User Input/Left to Right/Normal/VisualToastNotificationDomainUpDownUserInputForm.cs b/...Toast/User Input/Left to Right/Normal/VisualToastNotificationDomainUpDownUserInputForm.cs
@@ -147,7 +147,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -161,7 +161,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/...oast/User Input/Left to Right/Normal/VisualToastNotificationMaskedTextBoxUserInputForm.cs b/...oast/User Input/Left to Right/Normal/VisualToastNotificationMaskedTextBoxUserInputForm.cs
@@ -119,7 +119,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -133,7 +133,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/...oast/User Input/Left to Right/Normal/VisualToastNotificationNumericUpDownUserInputForm.cs b/...oast/User Input/Left to Right/Normal/VisualToastNotificationNumericUpDownUserInputForm.cs
@@ -123,7 +123,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -137,7 +137,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/...tion Toast/User Input/Left to Right/Normal/VisualToastNotificationTextBoxUserInputForm.cs b/...tion Toast/User Input/Left to Right/Normal/VisualToastNotificationTextBoxUserInputForm.cs
@@ -145,7 +145,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -159,7 +159,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/.../Left to Right/ProgressBar/VisualToastNotificationComboBoxUserInputWithProgressBarForm.cs b/.../Left to Right/ProgressBar/VisualToastNotificationComboBoxUserInputWithProgressBarForm.cs
@@ -130,7 +130,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -144,7 +144,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/.../Left to Right/ProgressBar/VisualToastNotificationDateTimeUserInputWithProgressBarForm.cs b/.../Left to Right/ProgressBar/VisualToastNotificationDateTimeUserInputWithProgressBarForm.cs
@@ -129,7 +129,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -143,7 +143,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/.../Left to Right/ProgressBar/VisualToastNotificationDomianUpDownInputWithProgressBarForm.cs b/.../Left to Right/ProgressBar/VisualToastNotificationDomianUpDownInputWithProgressBarForm.cs
@@ -129,7 +129,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -143,7 +143,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/...Left to Right/ProgressBar/VisualToastNotificationMaskedTextBoxInputWithProgressBarForm.cs b/...Left to Right/ProgressBar/VisualToastNotificationMaskedTextBoxInputWithProgressBarForm.cs
@@ -121,7 +121,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -135,7 +135,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/... to Right/ProgressBar/VisualToastNotificationNumericUpDownUserInputWithProgressBarForm.cs b/... to Right/ProgressBar/VisualToastNotificationNumericUpDownUserInputWithProgressBarForm.cs
@@ -125,7 +125,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -139,7 +139,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/...t/Left to Right/ProgressBar/VisualToastNotificationTextBoxUserInputWithProgressBarForm.cs b/...t/Left to Right/ProgressBar/VisualToastNotificationTextBoxUserInputWithProgressBarForm.cs
@@ -126,7 +126,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -140,7 +140,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/...t/User Input/Right to Left/Normal/VisualToastNotificationDateTimeUserInputRtlAwareForm.cs b/...t/User Input/Right to Left/Normal/VisualToastNotificationDateTimeUserInputRtlAwareForm.cs
@@ -125,7 +125,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -139,7 +139,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }

diff --git a/...er Input/Right to Left/Normal/VisualToastNotificationDomainUpDownUserInputRtlAwareForm.cs b/...er Input/Right to Left/Normal/VisualToastNotificationDomainUpDownUserInputRtlAwareForm.cs
@@ -138,7 +138,7 @@ private void UpdateIcon()
                     SetIcon(ToastNotificationImageResources.Toast_Notification_Information_128_x_128);
                     break;
                 case KryptonToastNotificationIcon.Shield:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(ToastNotificationImageResources.Toast_Notification_UAC_Shield_Windows_11_128_x_128);
                     }
@@ -152,7 +152,7 @@ private void UpdateIcon()
                     }
                     break;
                 case KryptonToastNotificationIcon.WindowsLogo:
-                    if (OSUtilities.IsWindowsEleven)
+                    if (OSUtilities.IsAtLeastWindowsEleven)
                     {
                         SetIcon(WindowsLogoImageResources.Windows_11_128_128);
                     }