Skip to content

Commit

Permalink
Merge branch 'hotfix/2.0.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
@cwensley
cwensley committed Dec 20, 2014
2 parents eaaf48c + 0fbc366 commit 06cecf6
Show file tree
Hide file tree
Showing 20 changed files with 103 additions and 95 deletions.
2 changes: 1 addition & 1 deletion Source/Addins/Eto.Addin.VisualStudio/Eto.Library/Eto.Library.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
14 changes: 7 additions & 7 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto.Desktop/Eto.Desktop.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Gtk" version="2.0.6" />
<package id="Eto.Platform.Gtk3" version="2.0.6" />
<package id="Eto.Platform.Windows" version="2.0.6" />
<package id="Eto.Platform.Wpf" version="2.0.6" />
<package id="Eto.Platform.Mac" version="2.0.6" />
<package id="Eto.Platform.Mac.Template" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Gtk" version="2.0.7" />
<package id="Eto.Platform.Gtk3" version="2.0.7" />
<package id="Eto.Platform.Windows" version="2.0.7" />
<package id="Eto.Platform.Wpf" version="2.0.7" />
<package id="Eto.Platform.Mac" version="2.0.7" />
<package id="Eto.Platform.Mac.Template" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
2 changes: 1 addition & 1 deletion Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Combined/Eto/Eto.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Gtk" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Gtk" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Gtk3" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Gtk3" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
6 changes: 3 additions & 3 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Mac/Eto.Mac.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Mac" version="2.0.6" />
<package id="Eto.Platform.Mac.Template" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Mac" version="2.0.7" />
<package id="Eto.Platform.Mac.Template" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.WinForms/Eto.WinForms.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Windows" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Windows" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.Wpf/Eto.Wpf.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Wpf" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Wpf" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.XamMac2" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.XamMac2" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
2 changes: 1 addition & 1 deletion Source/Addins/Eto.Addin.VisualStudio/Eto.PCL.Separate/Eto/Eto.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
14 changes: 7 additions & 7 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Combined/Eto.Desktop/Eto.Desktop.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Gtk" version="2.0.6" />
<package id="Eto.Platform.Gtk3" version="2.0.6" />
<package id="Eto.Platform.Windows" version="2.0.6" />
<package id="Eto.Platform.Wpf" version="2.0.6" />
<package id="Eto.Platform.Mac" version="2.0.6" />
<package id="Eto.Platform.Mac.Template" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Gtk" version="2.0.7" />
<package id="Eto.Platform.Gtk3" version="2.0.7" />
<package id="Eto.Platform.Windows" version="2.0.7" />
<package id="Eto.Platform.Wpf" version="2.0.7" />
<package id="Eto.Platform.Mac" version="2.0.7" />
<package id="Eto.Platform.Mac.Template" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk2/Eto.Gtk2.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Gtk" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Gtk" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Gtk3/Eto.Gtk3.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Gtk3" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Gtk3" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
6 changes: 3 additions & 3 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Mac/Eto.Mac.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Mac" version="2.0.6" />
<package id="Eto.Platform.Mac.Template" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Mac" version="2.0.7" />
<package id="Eto.Platform.Mac.Template" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.WinForms/Eto.WinForms.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Windows" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Windows" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.Wpf/Eto.Wpf.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.Wpf" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.Wpf" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
4 changes: 2 additions & 2 deletions Source/Addins/Eto.Addin.VisualStudio/Eto.SAL.Separate/Eto.XamMac2/Eto.XamMac2.vstemplate
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="Eto.Addin.VisualStudio">
<package id="Eto.Forms" version="2.0.6" />
<package id="Eto.Platform.XamMac2" version="2.0.6" />
<package id="Eto.Forms" version="2.0.7" />
<package id="Eto.Platform.XamMac2" version="2.0.7" />
</packages>
</WizardData>
</VSTemplate>
64 changes: 32 additions & 32 deletions Source/Addins/Eto.Addin.XamarinStudio/Eto.Addin.XamarinStudio.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,68 +112,68 @@
<None Include="Templates\Projects\Eto-SAL-Separate.xpt.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Forms.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Forms.2.0.6.nupkg')">
<Link>Packages\Eto.Forms.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Forms.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Forms.2.0.7.nupkg')">
<Link>Packages\Eto.Forms.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Forms.Sample.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Forms.Sample.2.0.6.nupkg')">
<Link>Packages\Eto.Forms.Sample.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Forms.Sample.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Forms.Sample.2.0.7.nupkg')">
<Link>Packages\Eto.Forms.Sample.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Direct2D.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Direct2D.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.Direct2D.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Direct2D.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Direct2D.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.Direct2D.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.Gtk.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.Gtk.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk3.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk3.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.Gtk3.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk3.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Gtk3.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.Gtk3.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.iOS.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.iOS.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.iOS.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.iOS.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.iOS.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.iOS.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.Mac.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.Mac.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.Template.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.Template.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.Mac.Template.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.Template.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac.Template.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.Mac.Template.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac64.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac64.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.Mac64.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac64.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Mac64.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.Mac64.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Windows.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Windows.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.Windows.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Windows.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Windows.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.Windows.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.WinRT.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.WinRT.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.WinRT.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.WinRT.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.WinRT.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.WinRT.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Wpf.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Wpf.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.Wpf.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Wpf.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.Wpf.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.Wpf.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.XamMac.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.XamMac.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac2.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac2.2.0.6.nupkg')">
<Link>Packages\Eto.Platform.XamMac2.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac2.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Platform.XamMac2.2.0.7.nupkg')">
<Link>Packages\Eto.Platform.XamMac2.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Json.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Json.2.0.6.nupkg')">
<Link>Packages\Eto.Serialization.Json.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Json.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Json.2.0.7.nupkg')">
<Link>Packages\Eto.Serialization.Json.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Xaml.2.0.6.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Xaml.2.0.6.nupkg')">
<Link>Packages\Eto.Serialization.Xaml.2.0.6.nupkg</Link>
<None Include="..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Xaml.2.0.7.nupkg" Condition="Exists('..\..\..\BuildOutput\Nuget\Release\Eto.Serialization.Xaml.2.0.7.nupkg')">
<Link>Packages\Eto.Serialization.Xaml.2.0.7.nupkg</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Templates\Projects\Eto-Library.xpt.xml">
Expand Down
44 changes: 26 additions & 18 deletions Source/Eto.Wpf/Forms/Controls/TabControlHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ namespace Eto.Wpf.Forms.Controls
public class TabControlHandler : WpfContainer<swc.TabControl, TabControl, TabControl.ICallback>, TabControl.IHandler
{
bool disableSelectedIndexChanged;
public TabControlHandler ()
public TabControlHandler()
{
Control = new swc.TabControl ();
Control.Loaded += delegate {
Control.SelectionChanged += delegate {
if (!disableSelectedIndexChanged)
Callback.OnSelectedIndexChanged(Widget, EventArgs.Empty);
};
Control = new swc.TabControl();
}

public override void OnLoadComplete(EventArgs e)
{
base.OnLoadComplete(e);
Control.SelectionChanged += (sender, ee) =>
{
if (ReferenceEquals(ee.Source, Control) && !disableSelectedIndexChanged)
Callback.OnSelectedIndexChanged(Widget, EventArgs.Empty);
};
}

Expand All @@ -34,29 +38,33 @@ public int SelectedIndex
set { Control.SelectedIndex = value; }
}

public void InsertTab (int index, TabPage page)
public void InsertTab(int index, TabPage page)
{
if (index == -1)
Control.Items.Add (page.ControlObject);
Control.Items.Add(page.ControlObject);
else
Control.Items.Insert (index, page.ControlObject);
if (Widget.Loaded && Control.Items.Count == 1)
Control.Items.Insert(index, page.ControlObject);
if (Control.Items.Count == 1)
SelectedIndex = 0;
}

public void ClearTabs ()
public void ClearTabs()
{
Control.Items.Clear ();
Control.Items.Clear();
}

public void RemoveTab (int index, TabPage page)
public void RemoveTab(int index, TabPage page)
{
disableSelectedIndexChanged = true;
try {
Control.Items.Remove (page.ControlObject);
if (Widget.Loaded)
try
{
var isSelected = SelectedIndex == index;
Control.Items.Remove(page.ControlObject);
if (Widget.Loaded && isSelected)
Callback.OnSelectedIndexChanged(Widget, EventArgs.Empty);
} finally {
}
finally
{
disableSelectedIndexChanged = false;
}
}
Expand Down
Loading

0 comments on commit 06cecf6

Please sign in to comment.