diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss
index af3b49e7..a9681099 100644
--- a/collects/mred/mred.ss
+++ b/collects/mred/mred.ss
@@ -4764,9 +4764,9 @@
 	(check-callback cwho paint-callback)
 	(check-label-string/false cwho label)))
     (public
-      [swap-gl-buffers (lambda () (send wx swap-buffers))]
+      [swap-gl-buffers (lambda () (send (send (send wx get-dc) get-gl) swap-buffers))]
       [with-gl-context (lambda (thunk) 
-			 (parameterize ([wx:current-gl-context (mred->wx this)])
+			 (parameterize ([wx:current-gl-context (send (send wx get-dc) get-gl)])
 			   (thunk)))]
       [accept-tab-focus (entry-point
 			 (case-lambda
diff --git a/collects/mred/private/kernel.ss b/collects/mred/private/kernel.ss
index 52e592b3..aaf7c954 100644
--- a/collects/mred/private/kernel.ss
+++ b/collects/mred/private/kernel.ss
@@ -339,8 +339,6 @@
     on-set-focus
     on-kill-focus
     set-background-to-gray
-    this-context-current
-    swap-buffers
     on-scroll
     set-scroll-page
     set-scroll-range
@@ -363,6 +361,7 @@
     start-page
     start-doc
     ok?
+    get-gl
     get-size
     get-text-foreground
     get-text-background
@@ -411,6 +410,11 @@
     get-pixel)
   (define-class post-script-dc% dc% ([interactive? #t] [parent #f] [use-paper-bbox? #f]))
   (define-class printer-dc% dc% ([parent #f]))
+  (define-private-class gl% gl<%> object% #f
+    with-context
+    set-as-context
+    swap-buffers
+    ok?)
   (define-class event% object% ([time-stamp 0])
     get-time-stamp
     set-time-stamp)