From 0a95b20860ee5103eee23c78aaf6803b25c30340 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 13 Jun 2017 22:45:10 +0200 Subject: [PATCH] GdkWindow is deprecated in GTK3. Splitting out into two accessors. --- src/OpenTK.GLWidget/GLWidget.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/OpenTK.GLWidget/GLWidget.cs b/src/OpenTK.GLWidget/GLWidget.cs index e2c0efa..63d133f 100644 --- a/src/OpenTK.GLWidget/GLWidget.cs +++ b/src/OpenTK.GLWidget/GLWidget.cs @@ -396,13 +396,19 @@ namespace OpenTK else Console.WriteLine("OpenTK running on X11"); +#if GTK3 + IntPtr widgetWindowHandle = this.Window.Handle; +#else + IntPtr widgetWindowHandle = this.GdkWindow.Handle; +#endif + // IWindowInfo if (Configuration.RunningOnWindows) - _WindowInfo = WinWindowsInfoInitializer.Initialize(this.Window.Handle); + _WindowInfo = WinWindowsInfoInitializer.Initialize(widgetWindowHandle); else if (Configuration.RunningOnMacOS) - _WindowInfo = OSXWindowInfoInitializer.Initialize(this.Window.Handle); + _WindowInfo = OSXWindowInfoInitializer.Initialize(widgetWindowHandle); else - _WindowInfo = XWindowInfoInitializer.Initialize(graphicsMode, this.Display.Handle, this.Screen.Number, this.Window.Handle, this.RootWindow.Handle); + _WindowInfo = XWindowInfoInitializer.Initialize(graphicsMode, this.Display.Handle, this.Screen.Number, widgetWindowHandle, this.RootWindow.Handle); // GraphicsContext _GraphicsContext = new GraphicsContext(graphicsMode, _WindowInfo, GlVersionMajor, GlVersionMinor, _GraphicsContextFlags); -- 2.7.4