From 734666f742b028f2f4c9bd01a58f2b10ceb1bfd4 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 2 Oct 2018 15:51:38 -0700 Subject: [PATCH] Convert WindowProvider to use generic type --- Program.cs | 3 +-- .../MatterControl/MatterControlUtilities.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Program.cs b/Program.cs index ccc3b9407..989b66537 100644 --- a/Program.cs +++ b/Program.cs @@ -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); diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index d17b14058..c3cab4523 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -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