Fixes #704 by removing invalid casts

fluentribbon · Mar 6, 2019 · 59d2ccd · 59d2ccd
1 parent f26cb56
commit 59d2ccd
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -118,7 +118,8 @@
   - [#673](../../issues/673) - RibbonContextualTabGroup not shown
   - [#677](../../issues/677) - Alt Codes no longer working in alpha version v7.0.0
   - [#688](../../issues/688) - Backstage and StartScreen closing when pressing Alt
-  - [#698](../../issues/698) - Submenus in the application menu are not opened each time 
+  - [#698](../../issues/698) - Submenus in the application menu are not opened each time
+  - [#704](../../issues/704) - CheckBox.Header - InvalidCastException
 
 - ### Enhancements/Features
   - [#516](../../issues/516) - Add options to hide the row containing RibbonTabItems  

diff --git a/Fluent.Ribbon/Controls/CheckBox.cs b/Fluent.Ribbon/Controls/CheckBox.cs
@@ -71,7 +71,7 @@ public string KeyTip
         /// <inheritdoc />
         public object Header
         {
-            get { return (string)this.GetValue(HeaderProperty); }
+            get { return this.GetValue(HeaderProperty); }
             set { this.SetValue(HeaderProperty, value); }
         }
 

diff --git a/Fluent.Ribbon/Controls/ComboBox.cs b/Fluent.Ribbon/Controls/ComboBox.cs
@@ -120,7 +120,7 @@ public string KeyTip
         /// <inheritdoc />
         public object Header
         {
-            get { return (string)this.GetValue(HeaderProperty); }
+            get { return this.GetValue(HeaderProperty); }
             set { this.SetValue(HeaderProperty, value); }
         }
 

diff --git a/Fluent.Ribbon/Controls/RadioButton.cs b/Fluent.Ribbon/Controls/RadioButton.cs
@@ -71,7 +71,7 @@ public string KeyTip
         /// <inheritdoc />
         public object Header
         {
-            get { return (string)this.GetValue(HeaderProperty); }
+            get { return this.GetValue(HeaderProperty); }
             set { this.SetValue(HeaderProperty, value); }
         }
 

diff --git a/Fluent.Ribbon/Controls/RibbonControl.cs b/Fluent.Ribbon/Controls/RibbonControl.cs
@@ -42,7 +42,7 @@ public string KeyTip
         /// <inheritdoc />
         public object Header
         {
-            get { return (string)this.GetValue(HeaderProperty); }
+            get { return this.GetValue(HeaderProperty); }
             set { this.SetValue(HeaderProperty, value); }
         }
 

diff --git a/Fluent.Ribbon/Controls/ToggleButton.cs b/Fluent.Ribbon/Controls/ToggleButton.cs
@@ -89,7 +89,7 @@ public string GroupName
         /// <inheritdoc />
         public object Header
         {
-            get { return (string)this.GetValue(HeaderProperty); }
+            get { return this.GetValue(HeaderProperty); }
             set { this.SetValue(HeaderProperty, value); }
         }