Fixes #274 by changing Icon and LargeIcon to object on various controls

fluentribbon · Feb 26, 2016 · d536ad1 · d536ad1
1 parent 363fef3
commit d536ad1
Show file tree

Hide file tree

Showing 7 changed files with 990 additions and 994 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -44,6 +44,7 @@
   - [#263](../../issues/263) - Changing theme from backstage is broken
   - [#269](../../issues/269) - Show underscore of header text on RibbonTabItem
   - [#272](../../issues/272) - Changing RibbonThemeColorBrush does not change background of ItemsPanel in Backstage
+  - [#274](../../issues/274) - RadioButton Icon and LargeIcon
   - OpenBackstage command was not acting on the correct backstage in a multiple backstage scenario (thanks to @maurosampietro)
 
 - ### Enhancements

diff --git a/Fluent.Ribbon/Controls/CheckBox.cs b/Fluent.Ribbon/Controls/CheckBox.cs
@@ -123,19 +123,17 @@ private static void OnIconChanged(DependencyObject d, DependencyPropertyChangedE
         /// <summary>
         /// Gets or sets button large icon
         /// </summary>
-        public ImageSource LargeIcon
+        public object LargeIcon
         {
-            get { return (ImageSource)this.GetValue(LargeIconProperty); }
+            get { return this.GetValue(LargeIconProperty); }
             set { this.SetValue(LargeIconProperty, value); }
         }
 
         /// <summary>
         /// Using a DependencyProperty as the backing store for SmallIcon. 
         /// This enables animation, styling, binding, etc...
         /// </summary>
-        public static readonly DependencyProperty LargeIconProperty =
-            DependencyProperty.Register("LargeIcon", typeof(ImageSource),
-            typeof(CheckBox), new UIPropertyMetadata(null));
+        public static readonly DependencyProperty LargeIconProperty = DependencyProperty.Register("LargeIcon", typeof(object), typeof(CheckBox), new UIPropertyMetadata(null));
 
         #endregion