diff --git a/Samples/SampleControl/SampleControl.csproj b/Samples/SampleControl/SampleControl.csproj index b867316..b89fc47 100644 --- a/Samples/SampleControl/SampleControl.csproj +++ b/Samples/SampleControl/SampleControl.csproj @@ -36,21 +36,17 @@ 4 - - ..\packages\SharpDX.3.0.2\lib\net45\SharpDX.dll - True + + ..\..\WpfSharpDxControl\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\packages\SharpDX.Direct2D1.3.0.2\lib\net45\SharpDX.Direct2D1.dll - True + + ..\..\WpfSharpDxControl\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\packages\SharpDX.DXGI.3.0.2\lib\net45\SharpDX.DXGI.dll - True + + ..\..\WpfSharpDxControl\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\packages\SharpDX.Mathematics.3.0.2\lib\net45\SharpDX.Mathematics.dll - True + + ..\..\WpfSharpDxControl\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll diff --git a/Samples/SampleControl/packages.config b/Samples/SampleControl/packages.config index a3c3d1c..2361da6 100644 --- a/Samples/SampleControl/packages.config +++ b/Samples/SampleControl/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/WpfSharpDxControl/Win32HwndControl.cs b/WpfSharpDxControl/Win32HwndControl.cs index 1b81261..2d2421c 100644 --- a/WpfSharpDxControl/Win32HwndControl.cs +++ b/WpfSharpDxControl/Win32HwndControl.cs @@ -32,19 +32,13 @@ protected Win32HwndControl() private void OnLoaded(object sender, RoutedEventArgs routedEventArgs) { Initialize(); - HwndInitialized = true; - - Loaded -= OnLoaded; + HwndInitialized = true; } private void OnUnloaded(object sender, RoutedEventArgs routedEventArgs) { Uninitialize(); HwndInitialized = false; - - Unloaded -= OnUnloaded; - - Dispose(); } protected abstract void Initialize(); diff --git a/WpfSharpDxControl/WpfSharpDxControl.csproj b/WpfSharpDxControl/WpfSharpDxControl.csproj index 017af25..806312e 100644 --- a/WpfSharpDxControl/WpfSharpDxControl.csproj +++ b/WpfSharpDxControl/WpfSharpDxControl.csproj @@ -33,25 +33,20 @@ - - packages\SharpDX.3.0.2\lib\net45\SharpDX.dll - True + + packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - packages\SharpDX.Direct2D1.3.0.2\lib\net45\SharpDX.Direct2D1.dll - True + + packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - packages\SharpDX.Direct3D11.3.0.2\lib\net45\SharpDX.Direct3D11.dll - True + + packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - packages\SharpDX.DXGI.3.0.2\lib\net45\SharpDX.DXGI.dll - True + + packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - packages\SharpDX.Mathematics.3.0.2\lib\net45\SharpDX.Mathematics.dll - True + + packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll diff --git a/WpfSharpDxControl/packages.config b/WpfSharpDxControl/packages.config index c757b51..1770d0c 100644 --- a/WpfSharpDxControl/packages.config +++ b/WpfSharpDxControl/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file