From 80f8cdc63ff36e84dea5d6c61fb4509d0b1c6535 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Sun, 21 May 2017 01:45:12 +0200 Subject: [PATCH] Added preproccessor switching for Win32 GTK3. --- src/OpenTK.GLWidget/GLWidget.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/OpenTK.GLWidget/GLWidget.cs b/src/OpenTK.GLWidget/GLWidget.cs index 90b11d4..41c2b42 100644 --- a/src/OpenTK.GLWidget/GLWidget.cs +++ b/src/OpenTK.GLWidget/GLWidget.cs @@ -331,13 +331,21 @@ namespace OpenTK IWindowInfo InitializeWindows() { + #if GTK3 + IntPtr windowHandle = gdk_win32_window_get_handle(this.Window.Handle); + #else IntPtr windowHandle = gdk_win32_drawable_get_handle(GdkWindow.Handle); + #endif return Utilities.CreateWindowsWindowInfo(windowHandle); } +#if GTK3 + [SuppressUnmanagedCodeSecurity, DllImport("libgdk-3-0.dll", CallingConvention = CallingConvention.Cdecl)] + public static extern IntPtr gdk_win32_window_get_handle(IntPtr w); +#else [SuppressUnmanagedCodeSecurity, DllImport("libgdk-win32-2.0-0.dll")] public static extern IntPtr gdk_win32_drawable_get_handle(IntPtr d); - +#endif #endregion #region OSX Specific Initialization -- 2.7.4