GdkWindow is deprecated in GTK3. Splitting out into two accessors.
authorJarl Gullberg <jarl.gullberg@gmail.com>
Tue, 13 Jun 2017 20:45:10 +0000 (22:45 +0200)
committerJarl Gullberg <jarl.gullberg@gmail.com>
Tue, 13 Jun 2017 20:45:10 +0000 (22:45 +0200)
src/OpenTK.GLWidget/GLWidget.cs

index e2c0efa..63d133f 100644 (file)
@@ -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);