- Remove IPalette and use PaletteBase instead

- Fix fallout in abstract class useage - Rename `KryptonPalette` to `KryptonCustomPaletteBase` to reflect usage - Start to sort out code in `ThemeManager` - Some spelling mistake fixes #Krypton-Suite/Standard-Toolkit#827
Krypton-Suite · Dec 23, 2022 · 3fc274c · 3fc274c
1 parent 6cdd3ef
commit 3fc274c
Show file tree

Hide file tree

Showing 24 changed files with 163 additions and 166 deletions.
diff --git a/Source/Krypton Docking Examples/Docking Customized/ContentPropertyGrid.cs b/Source/Krypton Docking Examples/Docking Customized/ContentPropertyGrid.cs
@@ -52,7 +52,7 @@ private void ContentPropertyGrid_Load(object sender, EventArgs e)
         private void OnGlobalPaletteChanged(object sender, EventArgs e)
         {
             // Use the current font from the global palette
-            IPalette palette = KryptonManager.CurrentGlobalPalette;
+            var palette = KryptonManager.CurrentGlobalPalette;
             Font font = palette.GetContentShortTextFont(PaletteContentStyle.LabelNormalControl, PaletteState.Normal);
             propertyGrid1.Font = font;
         }

diff --git a/Source/Krypton Docking Examples/Docking Persistence/ContentPropertyGrid.cs b/Source/Krypton Docking Examples/Docking Persistence/ContentPropertyGrid.cs
@@ -52,7 +52,7 @@ private void ContentPropertyGrid_Load(object sender, EventArgs e)
         private void OnGlobalPaletteChanged(object sender, EventArgs e)
         {
             // Use the current font from the global palette
-            IPalette palette = KryptonManager.CurrentGlobalPalette;
+            var palette = KryptonManager.CurrentGlobalPalette;
             Font font = palette.GetContentShortTextFont(PaletteContentStyle.LabelNormalControl, PaletteState.Normal);
             propertyGrid1.Font = font;
         }

diff --git a/Source/Krypton Docking Examples/External Drag To Docking/ContentPropertyGrid.cs b/Source/Krypton Docking Examples/External Drag To Docking/ContentPropertyGrid.cs
@@ -52,7 +52,7 @@ private void ContentPropertyGrid_Load(object sender, EventArgs e)
         private void OnGlobalPaletteChanged(object sender, EventArgs e)
         {
             // Use the current font from the global palette
-            IPalette palette = KryptonManager.CurrentGlobalPalette;
+            var palette = KryptonManager.CurrentGlobalPalette;
             Font font = palette.GetContentShortTextFont(PaletteContentStyle.LabelNormalControl, PaletteState.Normal);
             propertyGrid1.Font = font;
         }

diff --git a/Source/Krypton Docking Examples/Standard Docking/ContentPropertyGrid.cs b/Source/Krypton Docking Examples/Standard Docking/ContentPropertyGrid.cs
@@ -52,7 +52,7 @@ private void ContentPropertyGrid_Load(object sender, EventArgs e)
         private void OnGlobalPaletteChanged(object sender, EventArgs e)
         {
             // Use the current font from the global palette
-            IPalette palette = KryptonManager.CurrentGlobalPalette;
+            var palette = KryptonManager.CurrentGlobalPalette;
             Font font = palette.GetContentShortTextFont(PaletteContentStyle.LabelNormalControl, PaletteState.Normal);
             propertyGrid1.Font = font;
         }

diff --git a/Source/Krypton Navigator Examples/Navigator Palettes/Form1.Designer.cs b/Source/Krypton Navigator Examples/Navigator Palettes/Form1.Designer.cs
diff --git a/Source/Krypton Toolkit Examples/Custom Control using Palettes/Form1.Designer.cs b/Source/Krypton Toolkit Examples/Custom Control using Palettes/Form1.Designer.cs
diff --git a/Source/Krypton Toolkit Examples/Custom Control using Palettes/MyUserControl.cs b/Source/Krypton Toolkit Examples/Custom Control using Palettes/MyUserControl.cs
@@ -22,7 +22,7 @@ public class MyUserControl : UserControl
     {
         private bool _mouseOver;
         private bool _mouseDown;
-        private IPalette _palette;
+        private PaletteBase _palette;
 
         public MyUserControl()
         {
@@ -37,11 +37,11 @@ public MyUserControl()
             // Hook into palette events
             if (_palette != null)
             {
-                _palette.PalettePaint += new EventHandler<PaletteLayoutEventArgs>(OnPalettePaint);
+                _palette.PalettePaint += OnPalettePaint;
             }
 
             // We want to be notified whenever the global palette changes
-            KryptonManager.GlobalPaletteChanged += new EventHandler(OnGlobalPaletteChanged);
+            KryptonManager.GlobalPaletteChanged += OnGlobalPaletteChanged;
         }
 
         protected override void Dispose(bool disposing)
@@ -51,12 +51,12 @@ protected override void Dispose(bool disposing)
                 // Unhook from the palette events
                 if (_palette != null)
                 {
-                    _palette.PalettePaint -= new EventHandler<PaletteLayoutEventArgs>(OnPalettePaint);
+                    _palette.PalettePaint -= OnPalettePaint;
                     _palette = null;
                 }
 
                 // Unhook from the static events, otherwise we cannot be garbage collected
-                KryptonManager.GlobalPaletteChanged -= new EventHandler(OnGlobalPaletteChanged);
+                KryptonManager.GlobalPaletteChanged -= OnGlobalPaletteChanged;
             }
 
             base.Dispose(disposing);
@@ -220,16 +220,16 @@ private void OnGlobalPaletteChanged(object sender, EventArgs e)
             // Unhook events from old palette
             if (_palette != null)
             {
-                _palette.PalettePaint -= new EventHandler<PaletteLayoutEventArgs>(OnPalettePaint);
+                _palette.PalettePaint -= OnPalettePaint;
             }
 
-            // Cache the new IPalette that is the global palette
+            // Cache the new PaletteBase that is the global palette
             _palette = KryptonManager.CurrentGlobalPalette;
 
             // Hook into events for the new palette
             if (_palette != null)
             {
-                _palette.PalettePaint += new EventHandler<PaletteLayoutEventArgs>(OnPalettePaint);
+                _palette.PalettePaint += OnPalettePaint;
             }
 
             // Change of palette means we should repaint to show any changes

diff --git a/Source/Krypton Toolkit Examples/Custom Control using Renderers/Form1.Designer.cs b/Source/Krypton Toolkit Examples/Custom Control using Renderers/Form1.Designer.cs