Skip to content

Commit 94eec13

Browse files
committed
V3.6.0 Released
1 parent aa93c69 commit 94eec13

File tree

1,066 files changed

+11758
-11206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,066 files changed

+11758
-11206
lines changed

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*************************************************************************************
2+
3+
Toolkit for WPF
24
3-
Extended WPF Toolkit
4-
5-
Copyright (C) 2007-2013 Xceed Software Inc.
5+
Copyright (C) 2007-2018 Xceed Software Inc.
66
77
This program is provided to you under the terms of the Microsoft Public
88
License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license
99
1010
For more features, controls, and fast professional support,
11-
pick up the Plus Edition at http://xceed.com/wpf_toolkit
11+
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
1212
1313
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
1414

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*************************************************************************************
2+
3+
Toolkit for WPF
24
3-
Extended WPF Toolkit
4-
5-
Copyright (C) 2007-2013 Xceed Software Inc.
5+
Copyright (C) 2007-2018 Xceed Software Inc.
66
77
This program is provided to you under the terms of the Microsoft Public
88
License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license
99
1010
For more features, controls, and fast professional support,
11-
pick up the Plus Edition at http://xceed.com/wpf_toolkit
11+
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
1212
1313
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
1414

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*************************************************************************************
2+
3+
Toolkit for WPF
24
3-
Extended WPF Toolkit
4-
5-
Copyright (C) 2007-2013 Xceed Software Inc.
5+
Copyright (C) 2007-2018 Xceed Software Inc.
66
77
This program is provided to you under the terms of the Microsoft Public
88
License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license
99
1010
For more features, controls, and fast professional support,
11-
pick up the Plus Edition at http://xceed.com/wpf_toolkit
11+
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
1212
1313
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
1414
@@ -21,7 +21,7 @@ This program is provided to you under the terms of the Microsoft Public
2121
internal static class _XceedVersionInfo
2222
{
2323
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
24-
public const string BaseVersion = "3.5";
24+
public const string BaseVersion = "3.6";
2525
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
2626
public const string Version = BaseVersion +
2727
".0.0";

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfoCommon.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*************************************************************************************
2+
3+
Toolkit for WPF
24
3-
Extended WPF Toolkit
4-
5-
Copyright (C) 2007-2013 Xceed Software Inc.
5+
Copyright (C) 2007-2018 Xceed Software Inc.
66
77
This program is provided to you under the terms of the Microsoft Public
88
License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license
99
1010
For more features, controls, and fast professional support,
11-
pick up the Plus Edition at http://xceed.com/wpf_toolkit
11+
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
1212
1313
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
1414

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!--***********************************************************************************
22
3-
Extended WPF Toolkit
3+
Toolkit for WPF
44
5-
Copyright (C) 2007-2013 Xceed Software Inc.
5+
Copyright (C) 2007-2018 Xceed Software Inc.
66
77
This program is provided to you under the terms of the Microsoft Public
88
License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license
99
1010
For more features, controls, and fast professional support,
11-
pick up the Plus Edition at http://xceed.com/wpf_toolkit
11+
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
1212
1313
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
1414

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*************************************************************************************
2+
3+
Toolkit for WPF
24
3-
Extended WPF Toolkit
4-
5-
Copyright (C) 2007-2013 Xceed Software Inc.
5+
Copyright (C) 2007-2018 Xceed Software Inc.
66
77
This program is provided to you under the terms of the Microsoft Public
88
License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license
99
1010
For more features, controls, and fast professional support,
11-
pick up the Plus Edition at http://xceed.com/wpf_toolkit
11+
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
1212
1313
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
1414

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*************************************************************************************
2+
3+
Toolkit for WPF
24
3-
Extended WPF Toolkit
4-
5-
Copyright (C) 2007-2013 Xceed Software Inc.
5+
Copyright (C) 2007-2018 Xceed Software Inc.
66
77
This program is provided to you under the terms of the Microsoft Public
88
License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license
99
1010
For more features, controls, and fast professional support,
11-
pick up the Plus Edition at http://xceed.com/wpf_toolkit
11+
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
1212
1313
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
1414
@@ -30,7 +30,7 @@ This program is provided to you under the terms of the Microsoft Public
3030

3131
[assembly: AssemblyCompany( "Xceed Software Inc." )]
3232
[assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
33-
[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
33+
[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2018" )]
3434

3535

3636

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!--***********************************************************************************
22
3-
Extended WPF Toolkit
3+
Toolkit for WPF
44
5-
Copyright (C) 2007-2013 Xceed Software Inc.
5+
Copyright (C) 2007-2018 Xceed Software Inc.
66
77
This program is provided to you under the terms of the Microsoft Public
88
License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license
99
1010
For more features, controls, and fast professional support,
11-
pick up the Plus Edition at http://xceed.com/wpf_toolkit
11+
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
1212
1313
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
1414
@@ -1273,7 +1273,9 @@
12731273
</Border>
12741274
<ContentPresenter Grid.Row="1"
12751275
FlowDirection="{TemplateBinding FlowDirection}"
1276-
Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}" />
1276+
Content="{Binding LayoutItem.View.Content, RelativeSource={RelativeSource TemplatedParent}}"
1277+
ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
1278+
ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" />
12771279

12781280
<!--<ContentPresenter
12791281
Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}"
@@ -1327,12 +1329,13 @@
13271329
BorderBrush="{TemplateBinding BorderBrush}">
13281330
<Grid Margin="3">
13291331
<Grid.RowDefinitions>
1330-
<RowDefinition Height="18" />
1332+
<RowDefinition MinHeight="18"
1333+
Height="Auto"/>
13311334
<RowDefinition Height="*" />
13321335
</Grid.RowDefinitions>
13331336
<Border x:Name="Header"
13341337
Padding="2,0,2,0">
1335-
<Grid>
1338+
<Grid UseLayoutRounding="True">
13361339
<Grid.ColumnDefinitions>
13371340
<ColumnDefinition Width="*" />
13381341
<ColumnDefinition Width="Auto" />
@@ -1500,14 +1503,15 @@
15001503
BorderBrush="{TemplateBinding BorderBrush}">
15011504
<Grid>
15021505
<Grid.RowDefinitions>
1503-
<RowDefinition Height="18" />
1506+
<RowDefinition MinHeight="18"
1507+
Height="Auto"/>
15041508
<RowDefinition Height="*" />
15051509
</Grid.RowDefinitions>
15061510
<Border x:Name="Header"
15071511
CornerRadius="1,1,0,0"
15081512
Padding="2,0,2,0"
15091513
Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}">
1510-
<Grid>
1514+
<Grid UseLayoutRounding="True">
15111515
<Grid.ColumnDefinitions>
15121516
<ColumnDefinition Width="*" />
15131517
<ColumnDefinition Width="Auto" />
Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
//------------------------------------------------------------------------------
2-
// <auto-generated>
3-
// This code was generated by a tool.
4-
// Runtime Version:4.0.30319.42000
5-
//
6-
// Changes to this file may cause incorrect behavior and will be lost if
7-
// the code is regenerated.
8-
// </auto-generated>
9-
//------------------------------------------------------------------------------
10-
11-
namespace XamlGeneratedNamespace {
12-
13-
14-
/// <summary>
15-
/// GeneratedInternalTypeHelper
16-
/// </summary>
17-
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
18-
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
19-
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
20-
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
21-
22-
/// <summary>
23-
/// CreateInstance
24-
/// </summary>
25-
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
26-
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
27-
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
28-
}
29-
30-
/// <summary>
31-
/// GetPropertyValue
32-
/// </summary>
33-
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
34-
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
35-
}
36-
37-
/// <summary>
38-
/// SetPropertyValue
39-
/// </summary>
40-
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
41-
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
42-
}
43-
44-
/// <summary>
45-
/// CreateDelegate
46-
/// </summary>
47-
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
48-
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
49-
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
50-
delegateType,
51-
handler}, null)));
52-
}
53-
54-
/// <summary>
55-
/// AddEventHandler
56-
/// </summary>
57-
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
58-
eventInfo.AddEventHandler(target, handler);
59-
}
60-
}
61-
}
62-
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by a tool.
4+
// Runtime Version:4.0.30319.42000
5+
//
6+
// Changes to this file may cause incorrect behavior and will be lost if
7+
// the code is regenerated.
8+
// </auto-generated>
9+
//------------------------------------------------------------------------------
10+
11+
namespace XamlGeneratedNamespace {
12+
13+
14+
/// <summary>
15+
/// GeneratedInternalTypeHelper
16+
/// </summary>
17+
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
18+
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
19+
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
20+
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
21+
22+
/// <summary>
23+
/// CreateInstance
24+
/// </summary>
25+
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
26+
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
27+
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
28+
}
29+
30+
/// <summary>
31+
/// GetPropertyValue
32+
/// </summary>
33+
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
34+
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
35+
}
36+
37+
/// <summary>
38+
/// SetPropertyValue
39+
/// </summary>
40+
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
41+
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
42+
}
43+
44+
/// <summary>
45+
/// CreateDelegate
46+
/// </summary>
47+
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
48+
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
49+
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
50+
delegateType,
51+
handler}, null)));
52+
}
53+
54+
/// <summary>
55+
/// AddEventHandler
56+
/// </summary>
57+
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
58+
eventInfo.AddEventHandler(target, handler);
59+
}
60+
}
61+
}
62+

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*************************************************************************************
2+
3+
Toolkit for WPF
24
3-
Extended WPF Toolkit
4-
5-
Copyright (C) 2007-2013 Xceed Software Inc.
5+
Copyright (C) 2007-2018 Xceed Software Inc.
66
77
This program is provided to you under the terms of the Microsoft Public
88
License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license
99
1010
For more features, controls, and fast professional support,
11-
pick up the Plus Edition at http://xceed.com/wpf_toolkit
11+
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
1212
1313
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
1414
@@ -21,7 +21,7 @@ This program is provided to you under the terms of the Microsoft Public
2121
internal static class _XceedVersionInfo
2222
{
2323
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
24-
public const string BaseVersion = "3.5";
24+
public const string BaseVersion = "3.6";
2525
[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
2626
public const string Version = BaseVersion +
2727
".0.0";

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfoCommon.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*************************************************************************************
2+
3+
Toolkit for WPF
24
3-
Extended WPF Toolkit
4-
5-
Copyright (C) 2007-2013 Xceed Software Inc.
5+
Copyright (C) 2007-2018 Xceed Software Inc.
66
77
This program is provided to you under the terms of the Microsoft Public
88
License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license
99
1010
For more features, controls, and fast professional support,
11-
pick up the Plus Edition at http://xceed.com/wpf_toolkit
11+
pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
1212
1313
Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
1414

0 commit comments

Comments
 (0)