From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Sat, 30 Apr 2016 05:50:07 +0000 (-0700)
Subject: gl: Use gtk_widget_register_window; not gdk_window_set_user_data.
X-Git-Tag: mit-scheme-pucked-9.2.12~329
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=b28b1dfd42336f3812621bbef7510b10eb70f89a;p=mit-scheme.git

gl: Use gtk_widget_register_window; not gdk_window_set_user_data.
---

diff --git a/src/gl/gl-glx.scm b/src/gl/gl-glx.scm
index 3353bb187..56675f8dc 100644
--- a/src/gl/gl-glx.scm
+++ b/src/gl/gl-glx.scm
@@ -129,7 +129,9 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	  (error-if-null GdkWindow "Could not create GdkWindow:" widget)
 	  (set-glx-widget-xwindow! widget (C-call "gdk_window_xid" GdkWindow))
 	  (C-call "gtk_widget_set_window" GtkWidget GdkWindow)
-	  (C-call "gdk_window_set_user_data" GdkWindow GtkWidget)
+	  (C-call "gtk_widget_register_window" GtkWidget GdkWindow)
+	  ;; gtk_widget_unregister_window (as well as gdk_window_destroy)
+	  ;; are called by the default unrealize method.
 	  (let ((alien (glx-widget-glxcontext widget)))
 	    (C-call "glXCreateContext" alien xdisplay visinfo 0 1)
 	    (error-if-null alien "Could not create GLXContext.")))))
diff --git a/src/gl/gl.cdecl b/src/gl/gl.cdecl
index caba6ba1a..9360bda68 100644
--- a/src/gl/gl.cdecl
+++ b/src/gl/gl.cdecl
@@ -330,9 +330,10 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	(attributes (* GdkWindowAttr))
 	(attributes_mask gint))
 
-(extern void gdk_window_set_user_data
-	(window (* GdkWindow))
-	(user_data gpointer))
+;;GDK_AVAILABLE_IN_3_8
+(extern void gtk_widget_register_window
+        (widget (* GtkWidget))
+	(window (* GdkWindow)))
 
 (enum (GDK_ALL_EVENTS_MASK))