Browse Source

Fix runtime issues because of removed components

pull/1789/head
Simon Ensslen 1 year ago
parent
commit
1ba900be07
  1. 4
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
  2. 4
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml

4
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml

@ -36,12 +36,10 @@
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckComboBox/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckListBox/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ChildWindow/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CollectionControl/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ColorCanvas/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ColorPicker/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DropDownButton/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/IconButton/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/MessageBox/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DateTimeUpDown/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DateTimePicker/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml" />
@ -50,7 +48,6 @@
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/RangeSlider/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/SplitButton/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/PropertyGrid/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/TimePicker/Themes/Aero2.NormalColor.xaml" />
@ -58,7 +55,6 @@
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/WatermarkComboBox/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/WatermarkTextBox/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Wizard/Themes/Aero2.NormalColor.xaml" />
<ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Zoombox/Themes/Aero2.NormalColor.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

4
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml

@ -35,13 +35,11 @@
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CheckComboBox/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CheckListBox/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ChildWindow/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CollectionControl/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ColorCanvas/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ColorPicker/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DropDownButton/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="IconButton/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Magnifier/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="MessageBox/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DateTimeUpDown/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DateTimePicker/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="MultiLineTextEditor/Themes/Generic.xaml" />
@ -49,7 +47,6 @@
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Pie/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="RangeSlider/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="SplitButton/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="PropertyGrid/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="RichTextBoxFormatBar/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="TimePicker/Themes/Generic.xaml" />
@ -57,6 +54,5 @@
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="WatermarkComboBox/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="WatermarkTextBox/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Wizard/Themes/Generic.xaml" />
<core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Zoombox/Themes/Generic.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

Loading…
Cancel
Save