nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert WindowProvider to use generic type

Browse source
This commit is contained in:
John Lewin 2018-10-02 15:51:38 -07:00
parent f79f4c50e8
commit 734666f742
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Program.cs
View file

@ -59,8 +59,7 @@ namespace MatterHackers.MatterControl
Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
// Set default Agg providers
AggContext.Config.ProviderTypes.SystemWindow = "MatterHackers.Agg.UI.OpenGLSystemWindow, agg_platform_win32";
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.WinformsSystemWindowProvider, agg_platform_win32";
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.WinformsSystemWindowProvider`1[[MatterHackers.Agg.UI.OpenGLSystemWindow, agg_platform_win32]], agg_platform_win32";
//AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.MatterControl.WinformsSingleWindowProvider, MatterControl.Winforms";
string userProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);

2
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -625,7 +625,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
Environment.CurrentDirectory = TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "bin", outputDirectory);
// Override the default SystemWindow type without config.json
AggContext.Config.ProviderTypes.SystemWindow = "MatterHackers.Agg.UI.OpenGLSystemWindow, agg_platform_win32";
AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.WinformsSystemWindowProvider`1[[MatterHackers.Agg.UI.OpenGLSystemWindow, agg_platform_win32]], agg_platform_win32";
#if !__ANDROID__
// Set the static data to point to the directory of MatterControl